You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/07/07 05:50:51 UTC
svn commit: r961087 [6/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...
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslOutcome.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslOutcome.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/types/AmqpSaslOutcome.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslOutcome.java Wed Jul 7 03:50:42 2010
@@ -24,7 +24,7 @@ import org.apache.activemq.amqp.protocol
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
import org.apache.activemq.amqp.protocol.types.IAmqpList;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a indicates the outcome of the sasl dialog
@@ -367,4 +367,4 @@ public interface AmqpSaslOutcome extends
return create(marshaller.decodeAmqpSaslOutcome(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslResponse.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslResponse.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/types/AmqpSaslResponse.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslResponse.java Wed Jul 7 03:50:42 2010
@@ -24,7 +24,7 @@ import org.apache.activemq.amqp.protocol
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
import org.apache.activemq.amqp.protocol.types.IAmqpList;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a security mechanism response
@@ -311,4 +311,4 @@ public interface AmqpSaslResponse extend
return create(marshaller.decodeAmqpSaslResponse(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSequenceNo.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSequenceNo.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/types/AmqpSequenceNo.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSequenceNo.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.Encoded;
import org.apache.activemq.amqp.protocol.types.AmqpSequenceNo;
import org.apache.activemq.amqp.protocol.types.AmqpUint;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a 32-bit RFC-1982 serial number
@@ -163,4 +163,4 @@ public interface AmqpSequenceNo extends
return create(marshaller.decodeAmqpUint(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSessionError.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSessionError.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/types/AmqpSessionError.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSessionError.java Wed Jul 7 03:50:42 2010
@@ -26,7 +26,7 @@ import org.apache.activemq.amqp.protocol
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
import org.apache.activemq.amqp.protocol.types.IAmqpList;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a details of a Session error
@@ -623,4 +623,4 @@ public interface AmqpSessionError extend
return create(marshaller.decodeAmqpSessionError(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSessionName.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSessionName.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/types/AmqpSessionName.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSessionName.java Wed Jul 7 03:50:42 2010
@@ -24,7 +24,7 @@ import org.apache.activemq.amqp.protocol
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
import org.apache.activemq.amqp.protocol.types.AmqpBinary;
import org.apache.activemq.amqp.protocol.types.AmqpSessionName;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a opaque Session name
@@ -162,4 +162,4 @@ public interface AmqpSessionName extends
return create(marshaller.decodeAmqpBinary(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpShort.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpShort.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/types/AmqpShort.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpShort.java Wed Jul 7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.lang.Short;
import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError;
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a integer in the range -(2^15) to 2^15 - 1
@@ -167,4 +167,4 @@ public interface AmqpShort extends AmqpT
return create(marshaller.decodeAmqpShort(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSource.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSource.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/types/AmqpSource.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSource.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.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
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!!!!!!!!!!!!//
@@ -657,4 +657,4 @@ public interface AmqpSource extends Amqp
return create(marshaller.decodeAmqpSource(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpString.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpString.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/types/AmqpString.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpString.java Wed Jul 7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.lang.String;
import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError;
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a a sequence of unicode characters
@@ -167,4 +167,4 @@ public interface AmqpString extends Amqp
return create(marshaller.decodeAmqpString(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSymbol.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSymbol.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/types/AmqpSymbol.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSymbol.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.types;
+package org.apache.activemq.amqp.protocol.types;
import java.io.DataInput;
import java.io.DataOutput;
@@ -23,7 +23,7 @@ import java.lang.String;
import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError;
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.buffer.Buffer;
/**
* Represents a symbolic values from a constrained domain
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTarget.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTarget.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/types/AmqpTarget.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTarget.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.types;
+package org.apache.activemq.amqp.protocol.types;
import java.io.DataInput;
import java.io.DataOutput;
@@ -28,7 +28,7 @@ import org.apache.activemq.amqp.protocol
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
import org.apache.activemq.amqp.protocol.types.IAmqpMap;
-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/types/AmqpTimestamp.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTimestamp.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/types/AmqpTimestamp.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTimestamp.java Wed Jul 7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.util.Date;
import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError;
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a an absolute point in time
@@ -167,4 +167,4 @@ public interface AmqpTimestamp extends A
return create(marshaller.decodeAmqpTimestamp(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTransfer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTransfer.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/types/AmqpTransfer.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTransfer.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.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
import org.apache.activemq.amqp.protocol.types.IAmqpList;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a transfer a Message
@@ -611,4 +611,4 @@ public interface AmqpTransfer extends Am
return create(marshaller.decodeAmqpTransfer(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTxn.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTxn.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/types/AmqpTxn.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTxn.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.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
import org.apache.activemq.amqp.protocol.types.IAmqpList;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a mark transaction boundaries
@@ -447,4 +447,4 @@ public interface AmqpTxn extends AmqpLis
return create(marshaller.decodeAmqpTxn(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUbyte.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUbyte.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/types/AmqpUbyte.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUbyte.java Wed Jul 7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.lang.Short;
import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError;
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a integer in the range 0 to 2^8 - 1
@@ -167,4 +167,4 @@ public interface AmqpUbyte extends AmqpT
return create(marshaller.decodeAmqpUbyte(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUint.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUint.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/types/AmqpUint.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUint.java Wed Jul 7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.lang.Long;
import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError;
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a integer in the range 0 to 2^32 - 1
@@ -167,4 +167,4 @@ public interface AmqpUint extends AmqpTy
return create(marshaller.decodeAmqpUint(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUlong.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUlong.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/types/AmqpUlong.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUlong.java Wed Jul 7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.math.BigInteger;
import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError;
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a integer in the range 0 to 2^64 - 1
@@ -167,4 +167,4 @@ public interface AmqpUlong extends AmqpT
return create(marshaller.decodeAmqpUlong(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUnlink.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUnlink.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/types/AmqpUnlink.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUnlink.java Wed Jul 7 03:50:42 2010
@@ -26,7 +26,7 @@ import org.apache.activemq.amqp.protocol
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
import org.apache.activemq.amqp.protocol.types.IAmqpList;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a close the Link
@@ -398,4 +398,4 @@ public interface AmqpUnlink extends Amqp
return create(marshaller.decodeAmqpUnlink(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUshort.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUshort.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/types/AmqpUshort.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUshort.java Wed Jul 7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.lang.Integer;
import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError;
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a integer in the range 0 to 2^16 - 1
@@ -167,4 +167,4 @@ public interface AmqpUshort extends Amqp
return create(marshaller.decodeAmqpUshort(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUuid.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUuid.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/types/AmqpUuid.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUuid.java Wed Jul 7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.util.UUID;
import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError;
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a a universally unique id as defined by RFC-4122 section 4.1.2
@@ -167,4 +167,4 @@ public interface AmqpUuid extends AmqpTy
return create(marshaller.decodeAmqpUuid(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpXid.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpXid.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/types/AmqpXid.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpXid.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.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.marshaller.Encoded;
import org.apache.activemq.amqp.protocol.types.IAmqpList;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
* Represents a dtx branch identifier
@@ -385,4 +385,4 @@ public interface AmqpXid extends AmqpLis
return create(marshaller.decodeAmqpXid(buffer, offset));
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/TypeFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/TypeFactory.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/types/TypeFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/TypeFactory.java Wed Jul 7 03:50:42 2010
@@ -19,7 +19,7 @@ package org.apache.activemq.amqp.protoco
import java.math.BigInteger;
import java.util.Date;
import java.util.UUID;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java Wed Jul 7 03:50:42 2010
@@ -11,7 +11,7 @@ import org.apache.activemq.amqp.protocol
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.types.AmqpType;
import org.apache.activemq.transport.Transport;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.buffer.Buffer;
import org.apache.activemq.wireformat.WireFormat;
import org.apache.activemq.wireformat.WireFormatFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java Wed Jul 7 03:50:42 2010
@@ -1,10 +1,8 @@
package org.apache.activemq.amqp.wireformat;
-import java.io.*;
-
import org.apache.activemq.amqp.protocol.marshaller.AmqpMarshaller;
import org.apache.activemq.amqp.protocol.types.*;
-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/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java Wed Jul 7 03:50:42 2010
@@ -32,7 +32,7 @@ import org.apache.activemq.ActiveMQConne
import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.apollo.test2.TestSupport;
import org.apache.activemq.broker.store.Store;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
/**
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml Wed Jul 7 03:50:42 2010
@@ -56,7 +56,7 @@
<plugins>
<plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
+ <groupId>org.fusesource.hawtbuf.proto</groupId>
<artifactId>activemq-protobuf</artifactId>
<configuration>
<type>alt</type>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java Wed Jul 7 03:50:42 2010
@@ -24,8 +24,8 @@ import org.apache.activemq.broker.store.
import org.apache.activemq.command.Message;
import org.apache.activemq.filter.MessageEvaluationContext;
import org.apache.activemq.openwire.OpenWireFormat;
-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 OpenWireMessageDelivery extends BrokerMessageDelivery {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java Wed Jul 7 03:50:42 2010
@@ -15,7 +15,7 @@ import org.apache.activemq.command.Trans
import org.apache.activemq.filter.Expression;
import org.apache.activemq.filter.FilterException;
import org.apache.activemq.filter.MessageEvaluationContext;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
public class OpenwireMessageEvaluationContext implements MessageEvaluationContext {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java Wed Jul 7 03:50:42 2010
@@ -92,7 +92,7 @@ import org.apache.activemq.openwire.Open
import org.apache.activemq.selector.SelectorParser;
import org.apache.activemq.state.CommandVisitor;
import org.apache.activemq.transport.WireFormatNegotiator;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.activemq.wireformat.WireFormat;
import org.fusesource.hawtdispatch.Dispatch;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java Wed Jul 7 03:50:42 2010
@@ -34,10 +34,10 @@ import javax.jms.MessageNotReadableExcep
import org.apache.activemq.IConnection;
import org.apache.activemq.util.JMSExceptionSupport;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.BufferEditor;
-import org.apache.activemq.util.buffer.ByteArrayInputStream;
-import org.apache.activemq.util.buffer.ByteArrayOutputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.BufferEditor;
+import org.fusesource.hawtbuf.ByteArrayInputStream;
+import org.fusesource.hawtbuf.ByteArrayOutputStream;
/**
* A <CODE>BytesMessage</CODE> object is used to send a message containing a
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQDestination.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQDestination.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQDestination.java Wed Jul 7 03:50:42 2010
@@ -39,7 +39,7 @@ import javax.jms.Topic;
import org.apache.activemq.jndi.JNDIBaseStorable;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.URISupport;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
/**
* @openwire:marshaller
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java Wed Jul 7 03:50:42 2010
@@ -36,9 +36,9 @@ import javax.jms.MessageNotWriteableExce
import org.apache.activemq.IConnection;
import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.activemq.util.MarshallingSupport;
-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.activemq.wireformat.WireFormat;
/**
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java Wed Jul 7 03:50:42 2010
@@ -33,9 +33,9 @@ import javax.jms.ObjectMessage;
import org.apache.activemq.IConnection;
import org.apache.activemq.util.ClassLoadingAwareObjectInputStream;
import org.apache.activemq.util.JMSExceptionSupport;
-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.Buffer;
+import org.fusesource.hawtbuf.ByteArrayInputStream;
+import org.fusesource.hawtbuf.ByteArrayOutputStream;
/**
* An <CODE>ObjectMessage</CODE> object is used to send a message that
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQQueue.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQQueue.java Wed Jul 7 03:50:42 2010
@@ -16,14 +16,12 @@
*/
package org.apache.activemq.command;
-import java.util.Collection;
-
import javax.jms.JMSException;
import javax.jms.Queue;
import org.apache.activemq.apollo.broker.Destination;
import org.apache.activemq.apollo.broker.Router;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
/**
*
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQQueue.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java Wed Jul 7 03:50:42 2010
@@ -37,9 +37,9 @@ import javax.jms.StreamMessage;
import org.apache.activemq.IConnection;
import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.activemq.util.MarshallingSupport;
-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.buffer.ByteArrayOutputStream;
/**
* A <CODE>StreamMessage</CODE> object is used to send a stream of primitive
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java Wed Jul 7 03:50:42 2010
@@ -20,7 +20,7 @@ import javax.jms.JMSException;
import javax.jms.TemporaryQueue;
import org.apache.activemq.apollo.broker.Router;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
/**
* @openwire:marshaller code="102"
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java Wed Jul 7 03:50:42 2010
@@ -20,7 +20,7 @@ import javax.jms.JMSException;
import javax.jms.TemporaryTopic;
import org.apache.activemq.apollo.broker.Router;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.buffer.AsciiBuffer;
/**
* @openwire:marshaller code="103"
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java Wed Jul 7 03:50:42 2010
@@ -32,9 +32,9 @@ import javax.jms.TextMessage;
import org.apache.activemq.IConnection;
import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.activemq.util.MarshallingSupport;
-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.activemq.wireformat.WireFormat;
/**
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTopic.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTopic.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTopic.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTopic.java Wed Jul 7 03:50:42 2010
@@ -20,7 +20,7 @@ import javax.jms.JMSException;
import javax.jms.Topic;
import org.apache.activemq.apollo.broker.Router;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
/**
* @org.apache.xbean.XBean element="topic" description="An ActiveMQ Topic
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTopic.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java Wed Jul 7 03:50:42 2010
@@ -30,9 +30,9 @@ import org.apache.activemq.broker.region
import org.apache.activemq.broker.region.MessageReference;
import org.apache.activemq.legacy.usage.MemoryUsage;
import org.apache.activemq.util.MarshallingSupport;
-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.activemq.wireformat.WireFormat;
/**
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/WireFormatInfo.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/WireFormatInfo.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/WireFormatInfo.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/WireFormatInfo.java Wed Jul 7 03:50:42 2010
@@ -26,9 +26,9 @@ import java.util.Map;
import org.apache.activemq.state.CommandVisitor;
import org.apache.activemq.util.MarshallingSupport;
-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.activemq.wireformat.WireFormat;
/**
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/WireFormatInfo.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java Wed Jul 7 03:50:42 2010
@@ -19,10 +19,10 @@ package org.apache.activemq.openwire;
import org.apache.activemq.command.CommandTypes;
import org.apache.activemq.command.DataStructure;
import org.apache.activemq.command.WireFormatInfo;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.BufferEditor;
-import org.apache.activemq.util.buffer.DataByteArrayInputStream;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.buffer.BufferEditor;
+import org.fusesource.hawtbuf.DataByteArrayInputStream;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.activemq.wireformat.WireFormat;
import org.apache.activemq.wireformat.WireFormatFactory;
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java Wed Jul 7 03:50:42 2010
@@ -17,7 +17,7 @@
package org.apache.activemq.openwire;
import org.apache.activemq.command.WireFormatInfo;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.buffer.Buffer;
import org.apache.activemq.wireformat.WireFormat;
import org.apache.activemq.wireformat.WireFormatFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java Wed Jul 7 03:50:42 2010
@@ -25,7 +25,7 @@ import org.apache.activemq.command.DataS
import org.apache.activemq.openwire.BooleanStream;
import org.apache.activemq.openwire.DataStreamMarshaller;
import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.buffer.Buffer;
public abstract class BaseDataStreamMarshaller implements DataStreamMarshaller {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java Wed Jul 7 03:50:42 2010
@@ -25,7 +25,7 @@ import org.apache.activemq.command.DataS
import org.apache.activemq.openwire.BooleanStream;
import org.apache.activemq.openwire.DataStreamMarshaller;
import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
public abstract class BaseDataStreamMarshaller implements DataStreamMarshaller {
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java Wed Jul 7 03:50:42 2010
@@ -25,7 +25,7 @@ import org.apache.activemq.command.DataS
import org.apache.activemq.openwire.BooleanStream;
import org.apache.activemq.openwire.DataStreamMarshaller;
import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
public abstract class BaseDataStreamMarshaller implements DataStreamMarshaller {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java Wed Jul 7 03:50:42 2010
@@ -25,7 +25,7 @@ import org.apache.activemq.command.DataS
import org.apache.activemq.openwire.BooleanStream;
import org.apache.activemq.openwire.DataStreamMarshaller;
import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
public abstract class BaseDataStreamMarshaller implements DataStreamMarshaller {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java Wed Jul 7 03:50:42 2010
@@ -25,7 +25,7 @@ import org.apache.activemq.command.DataS
import org.apache.activemq.openwire.BooleanStream;
import org.apache.activemq.openwire.DataStreamMarshaller;
import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
public abstract class BaseDataStreamMarshaller implements DataStreamMarshaller {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/util/MarshallingSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/util/MarshallingSupport.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/util/MarshallingSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/util/MarshallingSupport.java Wed Jul 7 03:50:42 2010
@@ -29,8 +29,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.activemq.util.buffer.DataByteArrayInputStream;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.DataByteArrayInputStream;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
/**
* The fixed version of the UTF8 encoding function. Some older JVM's UTF8
Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/util/MarshallingSupport.java
('svn:executable' removed)
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java Wed Jul 7 03:50:42 2010
@@ -57,7 +57,7 @@ import org.apache.activemq.filter.Boolea
import org.apache.activemq.openwire.v1.ActiveMQTextMessageTest;
import org.apache.activemq.openwire.v1.BrokerInfoTest;
import org.apache.activemq.openwire.v1.MessageAckTest;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java Wed Jul 7 03:50:42 2010
@@ -17,14 +17,13 @@
package org.apache.activemq.openwire.v1;
import java.io.DataOutputStream;
-import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import org.apache.activemq.command.BrokerId;
import org.apache.activemq.command.Message;
import org.apache.activemq.util.MarshallingSupport;
-import org.apache.activemq.util.buffer.ByteArrayOutputStream;
+import org.fusesource.hawtbuf.ByteArrayOutputStream;
/**
* Test case for the OpenWire marshalling for Message NOTE!: This file is auto
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java Wed Jul 7 03:50:42 2010
@@ -43,7 +43,7 @@ public class WireFormatInfoTest extends
{
byte data[] = "MarshalledProperties:1".getBytes();
- info.setMarshalledProperties(new org.apache.activemq.util.buffer.Buffer(data, 0, data.length));
+ info.setMarshalledProperties(new org.fusesource.hawtbuf.Buffer(data, 0, data.length));
}
}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java Wed Jul 7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.activemq.command.BrokerId;
import org.apache.activemq.command.Message;
import org.apache.activemq.util.MarshallingSupport;
-import org.apache.activemq.util.buffer.ByteArrayOutputStream;
+import org.fusesource.hawtbuf.ByteArrayOutputStream;
/**
* Test case for the OpenWire marshalling for Message NOTE!: This file is auto
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/WireFormatInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/WireFormatInfoTest.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/WireFormatInfoTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/WireFormatInfoTest.java Wed Jul 7 03:50:42 2010
@@ -44,7 +44,7 @@ public class WireFormatInfoTest extends
{
byte data[] = "MarshalledProperties:1".getBytes();
- info.setMarshalledProperties(new org.apache.activemq.util.buffer.Buffer(data, 0, data.length));
+ info.setMarshalledProperties(new org.fusesource.hawtbuf.Buffer(data, 0, data.length));
}
}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java Wed Jul 7 03:50:42 2010
@@ -50,11 +50,11 @@ public abstract class MessageTestSupport
info.setType("Type:10");
{
byte data[] = "Content:11".getBytes();
- info.setContent(new org.apache.activemq.util.buffer.Buffer(data, 0, data.length));
+ info.setContent(new org.fusesource.hawtbuf.Buffer(data, 0, data.length));
}
{
byte data[] = "MarshalledProperties:12".getBytes();
- info.setMarshalledProperties(new org.apache.activemq.util.buffer.Buffer(data, 0, data.length));
+ info.setMarshalledProperties(new org.fusesource.hawtbuf.Buffer(data, 0, data.length));
}
info.setDataStructure(createDataStructure("DataStructure:13"));
info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java Wed Jul 7 03:50:42 2010
@@ -17,10 +17,6 @@
*/
package org.apache.activemq.openwire.v4;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;
@@ -59,11 +55,11 @@ public abstract class MessageTestSupport
info.setType("Type:10");
{
byte data[] = "Content:11".getBytes();
- info.setContent(new org.apache.activemq.util.buffer.Buffer(data,0,data.length));
+ info.setContent(new org.fusesource.hawtbuf.Buffer(data,0,data.length));
}
{
byte data[] = "MarshalledProperties:12".getBytes();
- info.setMarshalledProperties(new org.apache.activemq.util.buffer.Buffer(data,0,data.length));
+ info.setMarshalledProperties(new org.fusesource.hawtbuf.Buffer(data,0,data.length));
}
info.setDataStructure(createDataStructure("DataStructure:13"));
info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java Wed Jul 7 03:50:42 2010
@@ -17,10 +17,6 @@
*/
package org.apache.activemq.openwire.v5;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;
@@ -59,11 +55,11 @@ public abstract class MessageTestSupport
info.setType("Type:10");
{
byte data[] = "Content:11".getBytes();
- info.setContent(new org.apache.activemq.util.buffer.Buffer(data,0,data.length));
+ info.setContent(new org.fusesource.hawtbuf.Buffer(data,0,data.length));
}
{
byte data[] = "MarshalledProperties:12".getBytes();
- info.setMarshalledProperties(new org.apache.activemq.util.buffer.Buffer(data,0,data.length));
+ info.setMarshalledProperties(new org.fusesource.hawtbuf.Buffer(data,0,data.length));
}
info.setDataStructure(createDataStructure("DataStructure:13"));
info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml Wed Jul 7 03:50:42 2010
@@ -49,7 +49,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
+ <groupId>org.fusesource.hawtbuf.proto</groupId>
<artifactId>activemq-protobuf</artifactId>
<scope>test</scope>
</dependency>
@@ -71,7 +71,7 @@
<plugins>
<plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
+ <groupId>org.fusesource.hawtbuf.proto</groupId>
<artifactId>activemq-protobuf</artifactId>
<configuration>
<type>alt</type>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java Wed Jul 7 03:50:42 2010
@@ -29,7 +29,7 @@ import org.apache.activemq.queue.Cursore
import org.apache.activemq.queue.CursoredQueue.QueueElement;
import org.apache.activemq.queue.Subscription.SubscriptionDelivery;
import org.apache.activemq.util.Mapper;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
public class ExclusivePersistentQueue<K, E> extends AbstractFlowQueue<E> implements IQueue<K, E> {
private CursoredQueue<E> queue;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java Wed Jul 7 03:50:42 2010
@@ -25,7 +25,7 @@ import org.apache.activemq.broker.store.
import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.util.Mapper;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
abstract public class PartitionedQueue<K, V> extends AbstractFlowQueue<V> implements IPartitionedQueue<K, V> {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedPriorityQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedPriorityQueue.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedPriorityQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedPriorityQueue.java Wed Jul 7 03:50:42 2010
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import org.apache.activemq.broker.store.QueueDescriptor;
import org.apache.activemq.flow.PrioritySizeLimiter;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
public class SharedPriorityQueue<K, V> extends PartitionedQueue<K, V> {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java Wed Jul 7 03:50:42 2010
@@ -33,7 +33,7 @@ import org.apache.activemq.queue.Cursore
import org.apache.activemq.queue.CursoredQueue.QueueElement;
import org.apache.activemq.queue.Subscription.SubscriptionDelivery;
import org.apache.activemq.util.Mapper;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
import org.apache.activemq.util.list.LinkedNode;
import org.apache.activemq.util.list.LinkedNodeList;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueueOld.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueueOld.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueueOld.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueueOld.java Wed Jul 7 03:50:42 2010
@@ -31,7 +31,7 @@ import org.apache.activemq.flow.IFlowSiz
import org.apache.activemq.flow.ISinkController;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.util.Mapper;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
import org.apache.activemq.util.list.LinkedNode;
import org.apache.activemq.util.list.LinkedNodeList;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Message.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Message.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Message.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Message.java Wed Jul 7 03:50:42 2010
@@ -24,7 +24,7 @@ import org.apache.activemq.flow.Commands
import org.apache.activemq.flow.Commands.Message.MessageBuffer;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.Mapper;
-import org.apache.activemq.util.buffer.UTF8Buffer;
+import org.fusesource.hawtbuf.UTF8Buffer;
/**
*
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java Wed Jul 7 03:50:42 2010
@@ -24,7 +24,7 @@ import org.apache.activemq.flow.Commands
import org.apache.activemq.flow.Commands.Destination.DestinationBean;
import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
import org.apache.activemq.util.Mapper;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java Wed Jul 7 03:50:42 2010
@@ -31,7 +31,7 @@ import org.apache.activemq.metric.Metric
import org.apache.activemq.metric.MetricCounter;
import org.apache.activemq.metric.Period;
import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
/**
*
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Router.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Router.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Router.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Router.java Wed Jul 7 03:50:42 2010
@@ -9,7 +9,7 @@ import java.util.HashMap;
import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.flow.Commands.Destination;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
import static org.apache.activemq.dispatch.internal.RunnableSupport.*;
@@ -45,4 +45,4 @@ public class Router {
}
}
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/transport/pipe/PipeTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/transport/pipe/PipeTransportFactory.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/transport/pipe/PipeTransportFactory.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/transport/pipe/PipeTransportFactory.java Wed Jul 7 03:50:42 2010
@@ -36,7 +36,7 @@ import org.apache.activemq.queue.actor.t
import org.apache.activemq.queue.actor.transport.TransportServerHandler;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.URISupport;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.buffer.Buffer;
import org.apache.activemq.wireformat.WireFormat;
import org.apache.activemq.wireformat.WireFormatFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml Wed Jul 7 03:50:42 2010
@@ -104,7 +104,7 @@
<!--
<plugin>
- <groupId>org.apache.activemq.protobuf</groupId>
+ <groupId>org.fusesource.hawtbuf.proto</groupId>
<artifactId>activemq-protobuf</artifactId>
<version>1.1-SNAPSHOT</version>
<configuration>
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/api/Paged.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/api/Paged.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/api/Paged.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/api/Paged.java Wed Jul 7 03:50:42 2010
@@ -18,7 +18,7 @@ package org.apache.hawtdb.api;
import java.nio.ByteBuffer;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.internal.page.HawtPageFile;
/**
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeIndex.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeIndex.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeIndex.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeIndex.java Wed Jul 7 03:50:42 2010
@@ -23,9 +23,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-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.Buffer;
+import org.fusesource.hawtbuf.buffer.DataByteArrayInputStream;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.activemq.util.marshaller.Marshaller;
import org.apache.hawtdb.api.BTreeIndexFactory;
import org.apache.hawtdb.api.Index;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeNode.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeNode.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeNode.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeNode.java Wed Jul 7 03:50:42 2010
@@ -28,7 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.api.EncoderDecoder;
import org.apache.hawtdb.api.IndexException;
import org.apache.hawtdb.api.IndexVisitor;