[hornetq-commits] JBoss hornetq SVN: r9465 - in branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl: wireformat and 1 other directory.

Author: jmesnil Date: 2010-07-26 07:37:13 -0400 (Mon, 26 Jul 2010) New Revision: 9465 Removed: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java Log: HA refactoring * remove unused NodeAnnouceMessage packet Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2010-07-26 05:03:59 UTC (rev 9464) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2010-07-26 11:37:13 UTC (rev 9465) @@ -132,12 +132,6 @@ } }); } -// else if (packet.getType() == PacketImpl.NODE_ANNOUNCE) -// { -// NodeAnnounceMessage msg = (NodeAnnounceMessage)packet; -// -// server.getClusterManager().announceNode(msg.getNodeID(), msg.isBackup(), msg.getConnector()); -// } } }); Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java 2010-07-26 05:03:59 UTC (rev 9464) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java 2010-07-26 11:37:13 UTC (rev 9465) @@ -21,7 +21,6 @@ import static org.hornetq.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; import static org.hornetq.core.protocol.core.impl.PacketImpl.DISCONNECT; import static org.hornetq.core.protocol.core.impl.PacketImpl.EXCEPTION; -import static org.hornetq.core.protocol.core.impl.PacketImpl.NODE_ANNOUNCE; import static org.hornetq.core.protocol.core.impl.PacketImpl.NULL_RESPONSE; import static org.hornetq.core.protocol.core.impl.PacketImpl.PACKETS_CONFIRMED; import static org.hornetq.core.protocol.core.impl.PacketImpl.PING; @@ -91,7 +90,6 @@ import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionMessage; import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; import org.hornetq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; import org.hornetq.core.protocol.core.impl.wireformat.NullResponseMessage; import org.hornetq.core.protocol.core.impl.wireformat.PacketsConfirmedMessage; import org.hornetq.core.protocol.core.impl.wireformat.Ping; @@ -497,11 +495,6 @@ packet = new ClusterTopologyChangeMessage(); break; } - case NODE_ANNOUNCE: - { - packet = new NodeAnnounceMessage(); - break; - } case SUBSCRIBE_TOPOLOGY: { packet = new SubscribeClusterTopologyUpdatesMessage(); Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java 2010-07-26 05:03:59 UTC (rev 9464) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java 2010-07-26 11:37:13 UTC (rev 9465) @@ -186,8 +186,6 @@ public static final byte CLUSTER_TOPOLOGY = 110; - public static final byte NODE_ANNOUNCE = 111; - public static final byte SUBSCRIBE_TOPOLOGY = 112; // Static -------------------------------------------------------- @@ -301,7 +299,7 @@ protected String getParentString() { - return "PACKET[type=" + type + ", channelID=" + channelID + "]"; + return "PACKET[type=" + type + ", channelID=" + channelID; } // Protected ----------------------------------------------------- Deleted: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java 2010-07-26 05:03:59 UTC (rev 9464) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java 2010-07-26 11:37:13 UTC (rev 9465) @@ -1,103 +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.api.core.TransportConfiguration; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.impl.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class NodeAnnounceMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(NodeAnnounceMessage.class); - - // Attributes ---------------------------------------------------- - - private String nodeID; - - private boolean backup; - - private TransportConfiguration connector; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public NodeAnnounceMessage(final String nodeID, final boolean backup, final TransportConfiguration tc) - { - super(PacketImpl.NODE_ANNOUNCE); - - this.nodeID = nodeID; - - this.backup = backup; - - this.connector = tc; - } - - public NodeAnnounceMessage() - { - super(PacketImpl.NODE_ANNOUNCE); - } - - // Public -------------------------------------------------------- - - - public String getNodeID() - { - return nodeID; - } - - public boolean isBackup() - { - return backup; - } - - public TransportConfiguration getConnector() - { - return connector; - } - - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeString(nodeID); - buffer.writeBoolean(backup); - connector.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - this.nodeID = buffer.readString(); - this.backup = buffer.readBoolean(); - connector = new TransportConfiguration(); - connector.decode(buffer); - } - - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -}