Author: borges Date: 2011-08-12 11:10:15 -0400 (Fri, 12 Aug 2011) New Revision: 11197 Added: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java Removed: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargemessageEndMessage.java Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/PacketDecoder.java branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java Log: Rename message class to use proper casing convention. Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/PacketDecoder.java =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/PacketDecoder.java 2011-08-12 13:58:57 UTC (rev 11196) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/PacketDecoder.java 2011-08-12 15:10:15 UTC (rev 11197) @@ -107,7 +107,7 @@ import org.hornetq.core.protocol.core.impl.wireformat.ReplicationJournalFileMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeingMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargemessageEndMessage; +import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; @@ -478,7 +478,7 @@ } case REPLICATION_LARGE_MESSAGE_END: { - packet = new ReplicationLargemessageEndMessage(); + packet = new ReplicationLargeMessageEndMessage(); break; } case REPLICATION_LARGE_MESSAGE_WRITE: Copied: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java (from rev 11190, branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargemessageEndMessage.java) =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java (rev 0) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java 2011-08-12 15:10:15 UTC (rev 11197) @@ -0,0 +1,79 @@ +/* + * 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.protocol.core.impl.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.impl.PacketImpl; + +/** + * A ReplicationLargemessageEndMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationLargeMessageEndMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + long messageId; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationLargeMessageEndMessage() + { + super(PacketImpl.REPLICATION_LARGE_MESSAGE_END); + } + + public ReplicationLargeMessageEndMessage(final long messageId) + { + this(); + this.messageId = messageId; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(messageId); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + messageId = buffer.readLong(); + } + + /** + * @return the messageId + */ + public long getMessageId() + { + return messageId; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargemessageEndMessage.java =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargemessageEndMessage.java 2011-08-12 13:58:57 UTC (rev 11196) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationLargemessageEndMessage.java 2011-08-12 15:10:15 UTC (rev 11197) @@ -1,79 +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.protocol.core.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.impl.PacketImpl; - -/** - * A ReplicationLargemessageEndMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargemessageEndMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - long messageId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationLargemessageEndMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_END); - } - - public ReplicationLargemessageEndMessage(final long messageId) - { - this(); - this.messageId = messageId; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2011-08-12 13:58:57 UTC (rev 11196) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2011-08-12 15:10:15 UTC (rev 11197) @@ -51,7 +51,7 @@ import org.hornetq.core.protocol.core.impl.wireformat.ReplicationJournalFileMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeingMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargemessageEndMessage; +import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; @@ -185,7 +185,7 @@ } else if (type == PacketImpl.REPLICATION_LARGE_MESSAGE_END) { - handleLargeMessageEnd((ReplicationLargemessageEndMessage)packet); + handleLargeMessageEnd((ReplicationLargeMessageEndMessage)packet); } else if (type == PacketImpl.REPLICATION_COMPARE_DATA) { @@ -472,7 +472,7 @@ return (JournalImpl)journalIf; } - private void handleLargeMessageEnd(final ReplicationLargemessageEndMessage packet) + private void handleLargeMessageEnd(final ReplicationLargeMessageEndMessage packet) { LargeServerMessage message = lookupLargeMessage(packet.getMessageId(), true); Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2011-08-12 13:58:57 UTC (rev 11196) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2011-08-12 15:10:15 UTC (rev 11197) @@ -46,8 +46,8 @@ import org.hornetq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationJournalFileMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeingMessage; +import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.protocol.core.impl.wireformat.ReplicationLargemessageEndMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; import org.hornetq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; @@ -268,7 +268,7 @@ { if (enabled) { - sendReplicatePacket(new ReplicationLargemessageEndMessage(messageId)); + sendReplicatePacket(new ReplicationLargeMessageEndMessage(messageId)); } }