[hornetq-commits] JBoss hornetq SVN: r10726 - in branches/HORNETQ-698_SplitJournal: hornetq-core/src/main/java/org/hornetq/core/buffers/impl and 4 other directories.

Wednesday, 25 May 2011


Author: borges
Date: 2011-05-25 13:25:44 -0400 (Wed, 25 May 2011)
New Revision: 10726

Added:
  
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/api/core/Message.java
  
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java
  
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/message/impl/MessageInternal.java
Removed:
  
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/api/core/Message.java
  
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java
  
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/message/impl/MessageInternal.java
Log:
Move back message classes

Copied:
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/api/core/Message.java
(from rev 10725,
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/api/core/Message.java)
===================================================================
---
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/api/core/Message.java	
                       (rev 0)
+++
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/api/core/Message.java	2011-05-25
17:25:44 UTC (rev 10726)
@@ -0,0 +1,520 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.api.core;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.hornetq.utils.UUID;
+
+
+/**
+ * A Message is a routable instance that has a payload.
+ * <br/>
+ * The payload (the "body") is opaque to the messaging system.
+ * A Message also has a fixed set of headers (required by the messaging system)
+ * and properties (defined by the users) that can be used by the messaging system
+ * to route the message (e.g. to ensure it matches a queue filter).
+ * <br>
+ * <h2>Message Properties</h2>
+ * 
+ * Message can contain properties specified by the users.
+ * It is possible to convert from some types to other types as specified
+ * by the following table:
+ * <pre>
+ * |        | boolean byte short int long float double String byte[] 
+ * |----------------------------------------------------------------
+ * |boolean |    X                                      X    
+ * |byte    |          X    X    X   X                  X 
+ * |short   |               X    X   X                  X 
+ * |int     |                    X   X                  X 
+ * |long    |                        X                  X 
+ * |float   |                              X     X      X 
+ * |double  |                                    X      X 
+ * |String  |    X     X    X    X   X     X     X      X 
+ * |byte[]  |                                                   X
+ * |-----------------------------------------------------------------
+ * </pre>
+ * <br>
+ * If conversion is not allowed (for example calling {@code getFloatProperty} on a
property set a {@code boolean}),
+ * a PropertyConversionException will be thrown.
+ *
+ * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
+ * @author <a
href="mailto:clebert.suconic@jboss.com">ClebertSuconic</a>
+ * @version <tt>$Revision: 3341 $</tt>
+ *
+ * $Id: Message.java 3341 2007-11-19 14:34:57Z timfox $
+ */
+public interface Message
+{
+   public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new
SimpleString("_HQ_ACTUAL_EXPIRY");
+   
+   public static final SimpleString HDR_ORIGINAL_ADDRESS = new
SimpleString("_HQ_ORIG_ADDRESS");
+
+   public static final SimpleString HDR_ORIG_MESSAGE_ID = new
SimpleString("_HQ_ORIG_MESSAGE_ID");
+
+   public static final SimpleString HDR_GROUP_ID = new
SimpleString("_HQ_GROUP_ID");
+   
+   public static final SimpleString HDR_LARGE_COMPRESSED = new
SimpleString("_HQ_LARGE_COMPRESSED");
+   
+   public static final SimpleString HDR_LARGE_BODY_SIZE = new
SimpleString("_HQ_LARGE_SIZE");
+
+   public static final SimpleString HDR_SCHEDULED_DELIVERY_TIME = new
SimpleString("_HQ_SCHED_DELIVERY");
+
+   public static final SimpleString HDR_DUPLICATE_DETECTION_ID = new
SimpleString("_HQ_DUPL_ID");
+
+   public static final SimpleString HDR_LAST_VALUE_NAME = new
SimpleString("_HQ_LVQ_NAME");
+
+   public static final byte DEFAULT_TYPE = 0;
+
+   public static final byte OBJECT_TYPE = 2;
+
+   public static final byte TEXT_TYPE = 3;
+
+   public static final byte BYTES_TYPE = 4;
+
+   public static final byte MAP_TYPE = 5;
+
+   public static final byte STREAM_TYPE = 6;
+   
+   /**
+    * Returns the messageID.
+    * <br>
+    * The messageID is set when the message is handled by the server.
+    */
+   long getMessageID();
+   
+   /**
+    * Returns the userID - this is an optional user specified UUID that can be set to
identify the message
+    * and will be passed around with the message
+    * @return the user id
+    */
+   UUID getUserID();
+   
+   /**
+    * Sets the user ID
+    * @param userID
+    */
+   void setUserID(UUID userID);
+
+   /**
+    * Returns the address this message is sent to.
+    */
+   SimpleString getAddress();
+
+   /**
+    * Sets the address to send this message to.
+    * 
+    * @param address address to send the message to
+    */
+   void setAddress(SimpleString address);
+
+   /**
+    * Returns this message type.
+    */
+   byte getType();
+
+   /**
+    * Returns whether this message is durable or not.
+    */
+   boolean isDurable();
+
+   /**
+    * Sets whether this message is durable or not.
+    * 
+    * @param durable {@code true} to flag this message as durable, {@code false} else
+    */
+   void setDurable(boolean durable);
+
+   /**
+    * Returns the expiration time of this message.
+    */
+   long getExpiration();
+
+   /**
+    * Returns whether this message is expired or not.
+    */
+   boolean isExpired();
+
+   /**
+    * Sets the expiration of this message.
+    * 
+    * @param expiration expiration time
+    */
+   void setExpiration(long expiration);
+
+   /**
+    * Returns the message timestamp.
+    * <br>
+    * The timestamp corresponds to the time this message
+    * was handled by a HornetQ server.
+    */
+   long getTimestamp();
+
+   /**
+    * Sets the message timestamp.
+    * 
+    * @param timestamp timestamp
+    */
+   void setTimestamp(long timestamp);
+
+   /**
+    * Returns the message priority.
+    * 
+    * Values range from 0 (less priority) to 9 (more priority) inclusive.
+    */
+   byte getPriority();
+
+   /**
+    * Sets the message priority.
+    * 
+    * Value must be between 0 and 9 inclusive.
+    * 
+    * @param priority the new message priority
+    */
+   void setPriority(byte priority);
+
+   /**
+    * Returns the size of the <em>encoded</em> message.
+    */
+   int getEncodeSize();
+
+   /**
+    * Returns whether this message is a <em>large message</em> or a regular
message.
+    */
+   boolean isLargeMessage();
+
+   /**
+    * Returns the message body as a HornetQBuffer
+    */
+   HornetQBuffer getBodyBuffer();
+
+   // Properties
+   // -----------------------------------------------------------------
+
+   /**
+    * Puts a boolean property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putBooleanProperty(SimpleString key, boolean value);
+
+   /**
+    * @see #putBooleanProperty(SimpleString, boolean)
+    */
+   void putBooleanProperty(String key, boolean value);
+
+   /**
+    * Puts a byte property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putByteProperty(SimpleString key, byte value);
+
+   /**
+    * @see #putByteProperty(SimpleString, byte)
+    */
+   void putByteProperty(String key, byte value);
+
+   /**
+    * Puts a byte[] property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putBytesProperty(SimpleString key, byte[] value);
+
+   /**
+    * @see #putBytesProperty(SimpleString, byte[])
+    */
+   void putBytesProperty(String key, byte[] value);
+
+   /**
+    * Puts a short property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putShortProperty(SimpleString key, short value);
+
+   /**
+    * @see #putShortProperty(SimpleString, short)
+    */
+   void putShortProperty(String key, short value);
+
+   /**
+    * Puts a int property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putIntProperty(SimpleString key, int value);
+
+   /**
+    * @see #putIntProperty(SimpleString, int)
+    */
+   void putIntProperty(String key, int value);
+
+   /**
+    * Puts a long property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putLongProperty(SimpleString key, long value);
+
+   /**
+    * @see #putLongProperty(SimpleString, long)
+    */
+   void putLongProperty(String key, long value);
+
+   /**
+    * Puts a float property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putFloatProperty(SimpleString key, float value);
+
+   /**
+    * @see #putFloatProperty(SimpleString, float)
+    */
+   void putFloatProperty(String key, float value);
+
+   /**
+    * Puts a double property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putDoubleProperty(SimpleString key, double value);
+
+   /**
+    * @see #putDoubleProperty(SimpleString, double)
+    */
+   void putDoubleProperty(String key, double value);
+
+   /**
+    * Puts a SimpleString property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putStringProperty(SimpleString key, SimpleString value);
+
+   /**
+    * Puts a String property in this message.
+    * 
+    * @param key property name
+    * @param value property value
+    */
+   void putStringProperty(String key, String value);
+   
+   /**
+    * Puts an Object property in this message.
+    * <br>
+    * Accepted types are:
+    * <ul>
+    *   <li>Boolean</li>
+    *   <li>Byte</li>
+    *   <li>Short</li>
+    *   <li>Integer</li>
+    *   <li>Long</li>
+    *   <li>Float</li>
+    *   <li>Double</li>
+    *   <li>String</li>
+    *   <li>SimpleString</li>
+    * </ul>
+    * 
+    * Using any other type will throw a PropertyConversionException.
+    * 
+    * @param key property name
+    * @param value property value
+    * 
+    * @throws PropertyConversionException if the value is not one of the accepted
property types.
+    */
+   void putObjectProperty(SimpleString key, Object value) throws
PropertyConversionException;
+
+   /**
+    * @see #putObjectProperty(SimpleString, Object)
+    */
+   void putObjectProperty(String key, Object value) throws PropertyConversionException;
+
+   /**
+    * Removes the property corresponding to the specified key.
+    * @param key property name
+    * @return the value corresponding to the specified key or @{code null}
+    */
+   Object removeProperty(SimpleString key);
+
+   
+   /**
+    * @see #removeProperty(SimpleString)
+    */
+   Object removeProperty(String key);
+
+   /**
+    * Returns {@code true} if this message contains a property with the given key, {@code
false} else.
+    * 
+    * @param key property name
+    */
+   boolean containsProperty(SimpleString key);
+   
+   /**
+    * @see #containsProperty(SimpleString)
+    */
+   boolean containsProperty(String key);
+
+   /**
+    * Returns the property corresponding to the specified key as a Boolean.
+    * 
+    * @throws PropertyConversionException if the value can not be converted to a Boolean
+    */
+   Boolean getBooleanProperty(SimpleString key) throws PropertyConversionException;
+
+   /**
+    * @see #getBooleanProperty(SimpleString)
+    */
+   Boolean getBooleanProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns the property corresponding to the specified key as a Byte.
+    * 
+    * @throws PropertyConversionException if the value can not be converted to a Byte
+    */
+   Byte getByteProperty(SimpleString key) throws PropertyConversionException;
+
+   /**
+    * @see #getByteProperty(SimpleString)
+    */
+   Byte getByteProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns the property corresponding to the specified key as a Double.
+    * 
+    * @throws PropertyConversionException if the value can not be converted to a Double
+    */
+   Double getDoubleProperty(SimpleString key) throws PropertyConversionException;
+
+   /**
+    * @see #getDoubleProperty(SimpleString)
+    */
+   Double getDoubleProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns the property corresponding to the specified key as an Integer.
+    * 
+    * @throws PropertyConversionException if the value can not be converted to an
Integer
+    */
+   Integer getIntProperty(SimpleString key) throws PropertyConversionException;
+
+   /**
+    * @see #getIntProperty(SimpleString)
+    */
+   Integer getIntProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns the property corresponding to the specified key as a Long.
+    * 
+    * @throws PropertyConversionException if the value can not be converted to a Long
+    */
+   Long getLongProperty(SimpleString key) throws PropertyConversionException;
+
+   /**
+    * @see #getLongProperty(SimpleString)
+    */
+   Long getLongProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns the property corresponding to the specified key
+    */
+   Object getObjectProperty(SimpleString key);
+
+   /**
+    * @see #getBooleanProperty(SimpleString)
+    */
+   Object getObjectProperty(String key);
+
+   /**
+    * Returns the property corresponding to the specified key as a Short.
+    * 
+    * @throws PropertyConversionException if the value can not be converted to a Short
+    */
+   Short getShortProperty(SimpleString key) throws PropertyConversionException;
+
+   /**
+    * @see #getShortProperty(SimpleString)
+    */
+   Short getShortProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns the property corresponding to the specified key as a Float.
+    * 
+    * @throws PropertyConversionException if the value can not be converted to a Float
+    */
+   Float getFloatProperty(SimpleString key) throws PropertyConversionException;
+
+   /**
+    * @see #getFloatProperty(SimpleString)
+    */
+   Float getFloatProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns the property corresponding to the specified key as a String.
+    * 
+    * @throws PropertyConversionException if the value can not be converted to a String
+    */
+   String getStringProperty(SimpleString key) throws PropertyConversionException;
+
+   /**
+    * @see #getStringProperty(SimpleString)
+    */
+   String getStringProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns the property corresponding to the specified key as a SimpleString.
+    * 
+    * @throws PropertyConversionException if the value can not be converted to a
SimpleString
+    */
+   SimpleString getSimpleStringProperty(SimpleString key) throws
PropertyConversionException;
+
+   /**
+    * @see #getSimpleStringProperty(SimpleString)
+    */
+   SimpleString getSimpleStringProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns the property corresponding to the specified key as a byte[].
+    * 
+    * @throws PropertyConversionException if the value can not be converted to a byte[]
+    */
+   byte[] getBytesProperty(SimpleString key) throws PropertyConversionException;
+
+   /**
+    * @see #getBytesProperty(SimpleString)
+    */
+   byte[] getBytesProperty(String key) throws PropertyConversionException;
+
+   /**
+    * Returns all the names of the properties for this message.
+    */
+   Set<SimpleString> getPropertyNames();
+
+   /**
+    * @return Returns the message in Map form, useful when encoding to JSON
+    */
+   Map<String, Object> toMap();  
+}

Copied:
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java
(from rev 10725,
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java)
===================================================================
---
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java	
                       (rev 0)
+++
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java	2011-05-25
17:25:44 UTC (rev 10726)
@@ -0,0 +1,379 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.core.buffers.impl;
+
+import java.nio.ByteBuffer;
+
+import org.hornetq.api.core.HornetQBuffer;
+import org.hornetq.api.core.SimpleString;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.message.impl.MessageInternal;
+
+/**
+ * A ResetLimitWrappedHornetQBuffer
+ *
+ * @author Tim Fox
+ *
+ */
+public class ResetLimitWrappedHornetQBuffer extends ChannelBufferWrapper
+{
+   private static final Logger log =
Logger.getLogger(ResetLimitWrappedHornetQBuffer.class);
+
+   private final int limit;
+
+   private final MessageInternal message;
+
+   public ResetLimitWrappedHornetQBuffer(final int limit, final HornetQBuffer buffer,
final MessageInternal message)
+   {
+      super(buffer.channelBuffer());
+
+      this.limit = limit;
+
+      if (writerIndex() < limit)
+      {
+         writerIndex(limit);
+      }
+      
+      buffer.readerIndex(limit);
+
+      this.message = message;
+   }
+
+   private void changed()
+   {
+      message.bodyChanged();
+   }
+
+   public void setBuffer(final HornetQBuffer buffer)
+   {
+      this.buffer = buffer.channelBuffer();
+   }
+
+   @Override
+   public void clear()
+   {
+      changed();
+
+      buffer.clear();
+
+      buffer.setIndex(limit, limit);
+
+   }
+
+   @Override
+   public void readerIndex(int readerIndex)
+   {
+      changed();
+      
+      if (readerIndex < limit)
+      {
+         readerIndex = limit;
+      }
+
+      buffer.readerIndex(readerIndex);
+   }
+
+   @Override
+   public void resetReaderIndex()
+   {
+      changed();
+      
+      buffer.readerIndex(limit);
+   }
+
+   @Override
+   public void resetWriterIndex()
+   {
+      changed();
+
+      buffer.writerIndex(limit);
+   }
+
+   @Override
+   public void setIndex(int readerIndex, int writerIndex)
+   {
+      changed();
+
+      if (readerIndex < limit)
+      {
+         readerIndex = limit;
+      }
+      if (writerIndex < limit)
+      {
+         writerIndex = limit;
+      }
+      buffer.setIndex(readerIndex, writerIndex);
+   }
+
+   @Override
+   public void writerIndex(int writerIndex)
+   {
+      changed();
+
+      if (writerIndex < limit)
+      {
+         writerIndex = limit;
+      }
+
+      buffer.writerIndex(writerIndex);
+   }
+
+   @Override
+   public void setByte(final int index, final byte value)
+   {
+      changed();
+
+      super.setByte(index, value);
+   }
+
+   @Override
+   public void setBytes(final int index, final byte[] src, final int srcIndex, final int
length)
+   {
+      changed();
+
+      super.setBytes(index, src, srcIndex, length);
+   }
+
+   @Override
+   public void setBytes(final int index, final byte[] src)
+   {
+      changed();
+
+      super.setBytes(index, src);
+   }
+
+   @Override
+   public void setBytes(final int index, final ByteBuffer src)
+   {
+      changed();
+
+      super.setBytes(index, src);
+   }
+
+   @Override
+   public void setBytes(final int index, final HornetQBuffer src, final int srcIndex,
final int length)
+   {
+      changed();
+
+      super.setBytes(index, src, srcIndex, length);
+   }
+
+   @Override
+   public void setBytes(final int index, final HornetQBuffer src, final int length)
+   {
+      changed();
+
+      super.setBytes(index, src, length);
+   }
+
+   @Override
+   public void setBytes(final int index, final HornetQBuffer src)
+   {
+      changed();
+
+      super.setBytes(index, src);
+   }
+
+   @Override
+   public void setChar(final int index, final char value)
+   {
+      changed();
+
+      super.setChar(index, value);
+   }
+
+   @Override
+   public void setDouble(final int index, final double value)
+   {
+      changed();
+
+      super.setDouble(index, value);
+   }
+
+   @Override
+   public void setFloat(final int index, final float value)
+   {
+      changed();
+
+      super.setFloat(index, value);
+   }
+
+   @Override
+   public void setInt(final int index, final int value)
+   {
+      changed();
+
+      super.setInt(index, value);
+   }
+
+   @Override
+   public void setLong(final int index, final long value)
+   {
+      changed();
+
+      super.setLong(index, value);
+   }
+
+   @Override
+   public void setShort(final int index, final short value)
+   {
+      changed();
+
+      super.setShort(index, value);
+   }
+
+   @Override
+   public void writeBoolean(final boolean val)
+   {
+      changed();
+
+      super.writeBoolean(val);
+   }
+
+   @Override
+   public void writeByte(final byte value)
+   {
+      changed();
+
+      super.writeByte(value);
+   }
+
+   @Override
+   public void writeBytes(final byte[] src, final int srcIndex, final int length)
+   {
+      changed();
+
+      super.writeBytes(src, srcIndex, length);
+   }
+
+   @Override
+   public void writeBytes(final byte[] src)
+   {
+      changed();
+
+      super.writeBytes(src);
+   }
+
+   @Override
+   public void writeBytes(final ByteBuffer src)
+   {
+      changed();
+
+      super.writeBytes(src);
+   }
+
+   @Override
+   public void writeBytes(final HornetQBuffer src, final int srcIndex, final int length)
+   {
+      changed();
+
+      super.writeBytes(src, srcIndex, length);
+   }
+
+   @Override
+   public void writeBytes(final HornetQBuffer src, final int length)
+   {
+      changed();
+
+      super.writeBytes(src, length);
+   }
+
+   @Override
+   public void writeChar(final char chr)
+   {
+      changed();
+
+      super.writeChar(chr);
+   }
+
+   @Override
+   public void writeDouble(final double value)
+   {
+      changed();
+
+      super.writeDouble(value);
+   }
+
+   @Override
+   public void writeFloat(final float value)
+   {
+      changed();
+
+      super.writeFloat(value);
+   }
+
+   @Override
+   public void writeInt(final int value)
+   {
+      changed();
+
+      super.writeInt(value);
+   }
+
+   @Override
+   public void writeLong(final long value)
+   {
+      changed();
+
+      super.writeLong(value);
+   }
+
+   @Override
+   public void writeNullableSimpleString(final SimpleString val)
+   {
+      changed();
+
+      super.writeNullableSimpleString(val);
+   }
+
+   @Override
+   public void writeNullableString(final String val)
+   {
+      changed();
+
+      super.writeNullableString(val);
+   }
+
+   @Override
+   public void writeShort(final short value)
+   {
+      changed();
+
+      super.writeShort(value);
+   }
+
+   @Override
+   public void writeSimpleString(final SimpleString val)
+   {
+      changed();
+
+      super.writeSimpleString(val);
+   }
+
+   @Override
+   public void writeString(final String val)
+   {
+      changed();
+
+      super.writeString(val);
+   }
+
+   @Override
+   public void writeUTF(final String utf)
+   {
+      changed();
+
+      super.writeUTF(utf);
+   }
+}

Copied:
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/message/impl/MessageInternal.java
(from rev 10725,
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/message/impl/MessageInternal.java)
===================================================================
---
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/message/impl/MessageInternal.java	
                       (rev 0)
+++
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/message/impl/MessageInternal.java	2011-05-25
17:25:44 UTC (rev 10726)
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.core.message.impl;
+
+import java.io.InputStream;
+
+import org.hornetq.api.core.HornetQBuffer;
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Message;
+import org.hornetq.api.core.SimpleString;
+import org.hornetq.core.message.BodyEncoder;
+import org.hornetq.utils.TypedProperties;
+
+/**
+ * A MessageInternal
+ *
+ * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
+ * 
+ * TODO - this can be refactored further to separate out large message specific stuff
+ *
+ *
+ */
+public interface MessageInternal extends Message
+{
+   void decodeFromBuffer(HornetQBuffer buffer);
+
+   int getEndOfMessagePosition();
+
+   int getEndOfBodyPosition();
+
+   void checkCopy();
+
+   void bodyChanged();
+
+   void resetCopied();
+   
+   boolean isServerMessage();
+
+   HornetQBuffer getEncodedBuffer();
+   
+   int getHeadersAndPropertiesEncodeSize();
+
+   HornetQBuffer getWholeBuffer();
+
+   void encodeHeadersAndProperties(HornetQBuffer buffer);
+
+   void decodeHeadersAndProperties(HornetQBuffer buffer);
+
+   BodyEncoder getBodyEncoder() throws HornetQException;  
+   
+   InputStream getBodyInputStream();
+
+   void setAddressTransient(SimpleString address);
+   
+   TypedProperties getTypedProperties();
+}

Deleted:
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/api/core/Message.java
===================================================================
---
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/api/core/Message.java	2011-05-25
17:24:27 UTC (rev 10725)
+++
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/api/core/Message.java	2011-05-25
17:25:44 UTC (rev 10726)
@@ -1,520 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.  See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.hornetq.api.core;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.hornetq.utils.UUID;
-
-
-/**
- * A Message is a routable instance that has a payload.
- * <br/>
- * The payload (the "body") is opaque to the messaging system.
- * A Message also has a fixed set of headers (required by the messaging system)
- * and properties (defined by the users) that can be used by the messaging system
- * to route the message (e.g. to ensure it matches a queue filter).
- * <br>
- * <h2>Message Properties</h2>
- * 
- * Message can contain properties specified by the users.
- * It is possible to convert from some types to other types as specified
- * by the following table:
- * <pre>
- * |        | boolean byte short int long float double String byte[] 
- * |----------------------------------------------------------------
- * |boolean |    X                                      X    
- * |byte    |          X    X    X   X                  X 
- * |short   |               X    X   X                  X 
- * |int     |                    X   X                  X 
- * |long    |                        X                  X 
- * |float   |                              X     X      X 
- * |double  |                                    X      X 
- * |String  |    X     X    X    X   X     X     X      X 
- * |byte[]  |                                                   X
- * |-----------------------------------------------------------------
- * </pre>
- * <br>
- * If conversion is not allowed (for example calling {@code getFloatProperty} on a
property set a {@code boolean}),
- * a PropertyConversionException will be thrown.
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a
href="mailto:clebert.suconic@jboss.com">ClebertSuconic</a>
- * @version <tt>$Revision: 3341 $</tt>
- *
- * $Id: Message.java 3341 2007-11-19 14:34:57Z timfox $
- */
-public interface Message
-{
-   public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new
SimpleString("_HQ_ACTUAL_EXPIRY");
-   
-   public static final SimpleString HDR_ORIGINAL_ADDRESS = new
SimpleString("_HQ_ORIG_ADDRESS");
-
-   public static final SimpleString HDR_ORIG_MESSAGE_ID = new
SimpleString("_HQ_ORIG_MESSAGE_ID");
-
-   public static final SimpleString HDR_GROUP_ID = new
SimpleString("_HQ_GROUP_ID");
-   
-   public static final SimpleString HDR_LARGE_COMPRESSED = new
SimpleString("_HQ_LARGE_COMPRESSED");
-   
-   public static final SimpleString HDR_LARGE_BODY_SIZE = new
SimpleString("_HQ_LARGE_SIZE");
-
-   public static final SimpleString HDR_SCHEDULED_DELIVERY_TIME = new
SimpleString("_HQ_SCHED_DELIVERY");
-
-   public static final SimpleString HDR_DUPLICATE_DETECTION_ID = new
SimpleString("_HQ_DUPL_ID");
-
-   public static final SimpleString HDR_LAST_VALUE_NAME = new
SimpleString("_HQ_LVQ_NAME");
-
-   public static final byte DEFAULT_TYPE = 0;
-
-   public static final byte OBJECT_TYPE = 2;
-
-   public static final byte TEXT_TYPE = 3;
-
-   public static final byte BYTES_TYPE = 4;
-
-   public static final byte MAP_TYPE = 5;
-
-   public static final byte STREAM_TYPE = 6;
-   
-   /**
-    * Returns the messageID.
-    * <br>
-    * The messageID is set when the message is handled by the server.
-    */
-   long getMessageID();
-   
-   /**
-    * Returns the userID - this is an optional user specified UUID that can be set to
identify the message
-    * and will be passed around with the message
-    * @return the user id
-    */
-   UUID getUserID();
-   
-   /**
-    * Sets the user ID
-    * @param userID
-    */
-   void setUserID(UUID userID);
-
-   /**
-    * Returns the address this message is sent to.
-    */
-   SimpleString getAddress();
-
-   /**
-    * Sets the address to send this message to.
-    * 
-    * @param address address to send the message to
-    */
-   void setAddress(SimpleString address);
-
-   /**
-    * Returns this message type.
-    */
-   byte getType();
-
-   /**
-    * Returns whether this message is durable or not.
-    */
-   boolean isDurable();
-
-   /**
-    * Sets whether this message is durable or not.
-    * 
-    * @param durable {@code true} to flag this message as durable, {@code false} else
-    */
-   void setDurable(boolean durable);
-
-   /**
-    * Returns the expiration time of this message.
-    */
-   long getExpiration();
-
-   /**
-    * Returns whether this message is expired or not.
-    */
-   boolean isExpired();
-
-   /**
-    * Sets the expiration of this message.
-    * 
-    * @param expiration expiration time
-    */
-   void setExpiration(long expiration);
-
-   /**
-    * Returns the message timestamp.
-    * <br>
-    * The timestamp corresponds to the time this message
-    * was handled by a HornetQ server.
-    */
-   long getTimestamp();
-
-   /**
-    * Sets the message timestamp.
-    * 
-    * @param timestamp timestamp
-    */
-   void setTimestamp(long timestamp);
-
-   /**
-    * Returns the message priority.
-    * 
-    * Values range from 0 (less priority) to 9 (more priority) inclusive.
-    */
-   byte getPriority();
-
-   /**
-    * Sets the message priority.
-    * 
-    * Value must be between 0 and 9 inclusive.
-    * 
-    * @param priority the new message priority
-    */
-   void setPriority(byte priority);
-
-   /**
-    * Returns the size of the <em>encoded</em> message.
-    */
-   int getEncodeSize();
-
-   /**
-    * Returns whether this message is a <em>large message</em> or a regular
message.
-    */
-   boolean isLargeMessage();
-
-   /**
-    * Returns the message body as a HornetQBuffer
-    */
-   HornetQBuffer getBodyBuffer();
-
-   // Properties
-   // -----------------------------------------------------------------
-
-   /**
-    * Puts a boolean property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putBooleanProperty(SimpleString key, boolean value);
-
-   /**
-    * @see #putBooleanProperty(SimpleString, boolean)
-    */
-   void putBooleanProperty(String key, boolean value);
-
-   /**
-    * Puts a byte property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putByteProperty(SimpleString key, byte value);
-
-   /**
-    * @see #putByteProperty(SimpleString, byte)
-    */
-   void putByteProperty(String key, byte value);
-
-   /**
-    * Puts a byte[] property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putBytesProperty(SimpleString key, byte[] value);
-
-   /**
-    * @see #putBytesProperty(SimpleString, byte[])
-    */
-   void putBytesProperty(String key, byte[] value);
-
-   /**
-    * Puts a short property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putShortProperty(SimpleString key, short value);
-
-   /**
-    * @see #putShortProperty(SimpleString, short)
-    */
-   void putShortProperty(String key, short value);
-
-   /**
-    * Puts a int property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putIntProperty(SimpleString key, int value);
-
-   /**
-    * @see #putIntProperty(SimpleString, int)
-    */
-   void putIntProperty(String key, int value);
-
-   /**
-    * Puts a long property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putLongProperty(SimpleString key, long value);
-
-   /**
-    * @see #putLongProperty(SimpleString, long)
-    */
-   void putLongProperty(String key, long value);
-
-   /**
-    * Puts a float property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putFloatProperty(SimpleString key, float value);
-
-   /**
-    * @see #putFloatProperty(SimpleString, float)
-    */
-   void putFloatProperty(String key, float value);
-
-   /**
-    * Puts a double property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putDoubleProperty(SimpleString key, double value);
-
-   /**
-    * @see #putDoubleProperty(SimpleString, double)
-    */
-   void putDoubleProperty(String key, double value);
-
-   /**
-    * Puts a SimpleString property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putStringProperty(SimpleString key, SimpleString value);
-
-   /**
-    * Puts a String property in this message.
-    * 
-    * @param key property name
-    * @param value property value
-    */
-   void putStringProperty(String key, String value);
-   
-   /**
-    * Puts an Object property in this message.
-    * <br>
-    * Accepted types are:
-    * <ul>
-    *   <li>Boolean</li>
-    *   <li>Byte</li>
-    *   <li>Short</li>
-    *   <li>Integer</li>
-    *   <li>Long</li>
-    *   <li>Float</li>
-    *   <li>Double</li>
-    *   <li>String</li>
-    *   <li>SimpleString</li>
-    * </ul>
-    * 
-    * Using any other type will throw a PropertyConversionException.
-    * 
-    * @param key property name
-    * @param value property value
-    * 
-    * @throws PropertyConversionException if the value is not one of the accepted
property types.
-    */
-   void putObjectProperty(SimpleString key, Object value) throws
PropertyConversionException;
-
-   /**
-    * @see #putObjectProperty(SimpleString, Object)
-    */
-   void putObjectProperty(String key, Object value) throws PropertyConversionException;
-
-   /**
-    * Removes the property corresponding to the specified key.
-    * @param key property name
-    * @return the value corresponding to the specified key or @{code null}
-    */
-   Object removeProperty(SimpleString key);
-
-   
-   /**
-    * @see #removeProperty(SimpleString)
-    */
-   Object removeProperty(String key);
-
-   /**
-    * Returns {@code true} if this message contains a property with the given key, {@code
false} else.
-    * 
-    * @param key property name
-    */
-   boolean containsProperty(SimpleString key);
-   
-   /**
-    * @see #containsProperty(SimpleString)
-    */
-   boolean containsProperty(String key);
-
-   /**
-    * Returns the property corresponding to the specified key as a Boolean.
-    * 
-    * @throws PropertyConversionException if the value can not be converted to a Boolean
-    */
-   Boolean getBooleanProperty(SimpleString key) throws PropertyConversionException;
-
-   /**
-    * @see #getBooleanProperty(SimpleString)
-    */
-   Boolean getBooleanProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns the property corresponding to the specified key as a Byte.
-    * 
-    * @throws PropertyConversionException if the value can not be converted to a Byte
-    */
-   Byte getByteProperty(SimpleString key) throws PropertyConversionException;
-
-   /**
-    * @see #getByteProperty(SimpleString)
-    */
-   Byte getByteProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns the property corresponding to the specified key as a Double.
-    * 
-    * @throws PropertyConversionException if the value can not be converted to a Double
-    */
-   Double getDoubleProperty(SimpleString key) throws PropertyConversionException;
-
-   /**
-    * @see #getDoubleProperty(SimpleString)
-    */
-   Double getDoubleProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns the property corresponding to the specified key as an Integer.
-    * 
-    * @throws PropertyConversionException if the value can not be converted to an
Integer
-    */
-   Integer getIntProperty(SimpleString key) throws PropertyConversionException;
-
-   /**
-    * @see #getIntProperty(SimpleString)
-    */
-   Integer getIntProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns the property corresponding to the specified key as a Long.
-    * 
-    * @throws PropertyConversionException if the value can not be converted to a Long
-    */
-   Long getLongProperty(SimpleString key) throws PropertyConversionException;
-
-   /**
-    * @see #getLongProperty(SimpleString)
-    */
-   Long getLongProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns the property corresponding to the specified key
-    */
-   Object getObjectProperty(SimpleString key);
-
-   /**
-    * @see #getBooleanProperty(SimpleString)
-    */
-   Object getObjectProperty(String key);
-
-   /**
-    * Returns the property corresponding to the specified key as a Short.
-    * 
-    * @throws PropertyConversionException if the value can not be converted to a Short
-    */
-   Short getShortProperty(SimpleString key) throws PropertyConversionException;
-
-   /**
-    * @see #getShortProperty(SimpleString)
-    */
-   Short getShortProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns the property corresponding to the specified key as a Float.
-    * 
-    * @throws PropertyConversionException if the value can not be converted to a Float
-    */
-   Float getFloatProperty(SimpleString key) throws PropertyConversionException;
-
-   /**
-    * @see #getFloatProperty(SimpleString)
-    */
-   Float getFloatProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns the property corresponding to the specified key as a String.
-    * 
-    * @throws PropertyConversionException if the value can not be converted to a String
-    */
-   String getStringProperty(SimpleString key) throws PropertyConversionException;
-
-   /**
-    * @see #getStringProperty(SimpleString)
-    */
-   String getStringProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns the property corresponding to the specified key as a SimpleString.
-    * 
-    * @throws PropertyConversionException if the value can not be converted to a
SimpleString
-    */
-   SimpleString getSimpleStringProperty(SimpleString key) throws
PropertyConversionException;
-
-   /**
-    * @see #getSimpleStringProperty(SimpleString)
-    */
-   SimpleString getSimpleStringProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns the property corresponding to the specified key as a byte[].
-    * 
-    * @throws PropertyConversionException if the value can not be converted to a byte[]
-    */
-   byte[] getBytesProperty(SimpleString key) throws PropertyConversionException;
-
-   /**
-    * @see #getBytesProperty(SimpleString)
-    */
-   byte[] getBytesProperty(String key) throws PropertyConversionException;
-
-   /**
-    * Returns all the names of the properties for this message.
-    */
-   Set<SimpleString> getPropertyNames();
-
-   /**
-    * @return Returns the message in Map form, useful when encoding to JSON
-    */
-   Map<String, Object> toMap();  
-}

Deleted:
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java
===================================================================
---
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java	2011-05-25
17:24:27 UTC (rev 10725)
+++
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java	2011-05-25
17:25:44 UTC (rev 10726)
@@ -1,379 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.  See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.hornetq.core.buffers.impl;
-
-import java.nio.ByteBuffer;
-
-import org.hornetq.api.core.HornetQBuffer;
-import org.hornetq.api.core.SimpleString;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.core.message.impl.MessageInternal;
-
-/**
- * A ResetLimitWrappedHornetQBuffer
- *
- * @author Tim Fox
- *
- */
-public class ResetLimitWrappedHornetQBuffer extends ChannelBufferWrapper
-{
-   private static final Logger log =
Logger.getLogger(ResetLimitWrappedHornetQBuffer.class);
-
-   private final int limit;
-
-   private final MessageInternal message;
-
-   public ResetLimitWrappedHornetQBuffer(final int limit, final HornetQBuffer buffer,
final MessageInternal message)
-   {
-      super(buffer.channelBuffer());
-
-      this.limit = limit;
-
-      if (writerIndex() < limit)
-      {
-         writerIndex(limit);
-      }
-      
-      buffer.readerIndex(limit);
-
-      this.message = message;
-   }
-
-   private void changed()
-   {
-      message.bodyChanged();
-   }
-
-   public void setBuffer(final HornetQBuffer buffer)
-   {
-      this.buffer = buffer.channelBuffer();
-   }
-
-   @Override
-   public void clear()
-   {
-      changed();
-
-      buffer.clear();
-
-      buffer.setIndex(limit, limit);
-
-   }
-
-   @Override
-   public void readerIndex(int readerIndex)
-   {
-      changed();
-      
-      if (readerIndex < limit)
-      {
-         readerIndex = limit;
-      }
-
-      buffer.readerIndex(readerIndex);
-   }
-
-   @Override
-   public void resetReaderIndex()
-   {
-      changed();
-      
-      buffer.readerIndex(limit);
-   }
-
-   @Override
-   public void resetWriterIndex()
-   {
-      changed();
-
-      buffer.writerIndex(limit);
-   }
-
-   @Override
-   public void setIndex(int readerIndex, int writerIndex)
-   {
-      changed();
-
-      if (readerIndex < limit)
-      {
-         readerIndex = limit;
-      }
-      if (writerIndex < limit)
-      {
-         writerIndex = limit;
-      }
-      buffer.setIndex(readerIndex, writerIndex);
-   }
-
-   @Override
-   public void writerIndex(int writerIndex)
-   {
-      changed();
-
-      if (writerIndex < limit)
-      {
-         writerIndex = limit;
-      }
-
-      buffer.writerIndex(writerIndex);
-   }
-
-   @Override
-   public void setByte(final int index, final byte value)
-   {
-      changed();
-
-      super.setByte(index, value);
-   }
-
-   @Override
-   public void setBytes(final int index, final byte[] src, final int srcIndex, final int
length)
-   {
-      changed();
-
-      super.setBytes(index, src, srcIndex, length);
-   }
-
-   @Override
-   public void setBytes(final int index, final byte[] src)
-   {
-      changed();
-
-      super.setBytes(index, src);
-   }
-
-   @Override
-   public void setBytes(final int index, final ByteBuffer src)
-   {
-      changed();
-
-      super.setBytes(index, src);
-   }
-
-   @Override
-   public void setBytes(final int index, final HornetQBuffer src, final int srcIndex,
final int length)
-   {
-      changed();
-
-      super.setBytes(index, src, srcIndex, length);
-   }
-
-   @Override
-   public void setBytes(final int index, final HornetQBuffer src, final int length)
-   {
-      changed();
-
-      super.setBytes(index, src, length);
-   }
-
-   @Override
-   public void setBytes(final int index, final HornetQBuffer src)
-   {
-      changed();
-
-      super.setBytes(index, src);
-   }
-
-   @Override
-   public void setChar(final int index, final char value)
-   {
-      changed();
-
-      super.setChar(index, value);
-   }
-
-   @Override
-   public void setDouble(final int index, final double value)
-   {
-      changed();
-
-      super.setDouble(index, value);
-   }
-
-   @Override
-   public void setFloat(final int index, final float value)
-   {
-      changed();
-
-      super.setFloat(index, value);
-   }
-
-   @Override
-   public void setInt(final int index, final int value)
-   {
-      changed();
-
-      super.setInt(index, value);
-   }
-
-   @Override
-   public void setLong(final int index, final long value)
-   {
-      changed();
-
-      super.setLong(index, value);
-   }
-
-   @Override
-   public void setShort(final int index, final short value)
-   {
-      changed();
-
-      super.setShort(index, value);
-   }
-
-   @Override
-   public void writeBoolean(final boolean val)
-   {
-      changed();
-
-      super.writeBoolean(val);
-   }
-
-   @Override
-   public void writeByte(final byte value)
-   {
-      changed();
-
-      super.writeByte(value);
-   }
-
-   @Override
-   public void writeBytes(final byte[] src, final int srcIndex, final int length)
-   {
-      changed();
-
-      super.writeBytes(src, srcIndex, length);
-   }
-
-   @Override
-   public void writeBytes(final byte[] src)
-   {
-      changed();
-
-      super.writeBytes(src);
-   }
-
-   @Override
-   public void writeBytes(final ByteBuffer src)
-   {
-      changed();
-
-      super.writeBytes(src);
-   }
-
-   @Override
-   public void writeBytes(final HornetQBuffer src, final int srcIndex, final int length)
-   {
-      changed();
-
-      super.writeBytes(src, srcIndex, length);
-   }
-
-   @Override
-   public void writeBytes(final HornetQBuffer src, final int length)
-   {
-      changed();
-
-      super.writeBytes(src, length);
-   }
-
-   @Override
-   public void writeChar(final char chr)
-   {
-      changed();
-
-      super.writeChar(chr);
-   }
-
-   @Override
-   public void writeDouble(final double value)
-   {
-      changed();
-
-      super.writeDouble(value);
-   }
-
-   @Override
-   public void writeFloat(final float value)
-   {
-      changed();
-
-      super.writeFloat(value);
-   }
-
-   @Override
-   public void writeInt(final int value)
-   {
-      changed();
-
-      super.writeInt(value);
-   }
-
-   @Override
-   public void writeLong(final long value)
-   {
-      changed();
-
-      super.writeLong(value);
-   }
-
-   @Override
-   public void writeNullableSimpleString(final SimpleString val)
-   {
-      changed();
-
-      super.writeNullableSimpleString(val);
-   }
-
-   @Override
-   public void writeNullableString(final String val)
-   {
-      changed();
-
-      super.writeNullableString(val);
-   }
-
-   @Override
-   public void writeShort(final short value)
-   {
-      changed();
-
-      super.writeShort(value);
-   }
-
-   @Override
-   public void writeSimpleString(final SimpleString val)
-   {
-      changed();
-
-      super.writeSimpleString(val);
-   }
-
-   @Override
-   public void writeString(final String val)
-   {
-      changed();
-
-      super.writeString(val);
-   }
-
-   @Override
-   public void writeUTF(final String utf)
-   {
-      changed();
-
-      super.writeUTF(utf);
-   }
-}

Deleted:
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/message/impl/MessageInternal.java
===================================================================
---
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/message/impl/MessageInternal.java	2011-05-25
17:24:27 UTC (rev 10725)
+++
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/message/impl/MessageInternal.java	2011-05-25
17:25:44 UTC (rev 10726)
@@ -1,67 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.  See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.hornetq.core.message.impl;
-
-import java.io.InputStream;
-
-import org.hornetq.api.core.HornetQBuffer;
-import org.hornetq.api.core.HornetQException;
-import org.hornetq.api.core.Message;
-import org.hornetq.api.core.SimpleString;
-import org.hornetq.core.message.BodyEncoder;
-import org.hornetq.utils.TypedProperties;
-
-/**
- * A MessageInternal
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * 
- * TODO - this can be refactored further to separate out large message specific stuff
- *
- *
- */
-public interface MessageInternal extends Message
-{
-   void decodeFromBuffer(HornetQBuffer buffer);
-
-   int getEndOfMessagePosition();
-
-   int getEndOfBodyPosition();
-
-   void checkCopy();
-
-   void bodyChanged();
-
-   void resetCopied();
-   
-   boolean isServerMessage();
-
-   HornetQBuffer getEncodedBuffer();
-   
-   int getHeadersAndPropertiesEncodeSize();
-
-   HornetQBuffer getWholeBuffer();
-
-   void encodeHeadersAndProperties(HornetQBuffer buffer);
-
-   void decodeHeadersAndProperties(HornetQBuffer buffer);
-
-   BodyEncoder getBodyEncoder() throws HornetQException;  
-   
-   InputStream getBodyInputStream();
-
-   void setAddressTransient(SimpleString address);
-   
-   TypedProperties getTypedProperties();
-}


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[hornetq-commits] JBoss hornetq SVN: r10726 - in branches/HORNETQ-698_SplitJournal: hornetq-core/src/main/java/org/hornetq/core/buffers/impl and 4 other directories.