http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java index 5912424..366aa3c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java @@ -11,62 +11,62 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol; +package org.apache.activemq.core.protocol; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT_REPLY; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.NODE_ANNOUNCE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST_RESPONSE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.QUORUM_VOTE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.QUORUM_VOTE_REPLY; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND_TX; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_COMMIT_ROLLBACK; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE_TX; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_END; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_EVENT; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_WRITE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_PREPARE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.REPLICATION_RESPONSE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SCALEDOWN_ANNOUNCEMENT; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CLUSTER_CONNECT_REPLY; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.NODE_ANNOUNCE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.BACKUP_REQUEST_RESPONSE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.QUORUM_VOTE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.QUORUM_VOTE_REPLY; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_APPEND_TX; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_COMMIT_ROLLBACK; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_DELETE_TX; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_END; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_EVENT; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_PAGE_WRITE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_PREPARE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.REPLICATION_RESPONSE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SCALEDOWN_ANNOUNCEMENT; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupRegistrationMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.NodeAnnounceMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupRequestMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.BackupResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationCommitMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRegistrationMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.BackupReplicationStartFailedMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterConnectReplyMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.NodeAnnounceMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRequestMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.BackupResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.QuorumVoteReplyMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationCommitMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageBeginMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageEndMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageEventMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPageWriteMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ScaleDownAnnounceMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java index b5be6ab..1b2382f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java @@ -10,102 +10,102 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core; - -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_CLOSE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_COMMIT; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_START; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_STOP; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_END; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_START; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; -import static org.apache.activemq6.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; +package org.apache.activemq.core.protocol.core; + +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CREATE_QUEUE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.DELETE_QUEUE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_CLOSE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_COMMIT; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_CONSUMER_CLOSE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_CREATECONSUMER; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_EXPIRED; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_FLOWTOKEN; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_INDIVIDUAL_ACKNOWLEDGE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_QUEUEQUERY; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_START; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_STOP; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_END; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_FORGET; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_GET_TIMEOUT; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_INDOUBT_XIDS; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_JOIN; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_PREPARE; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_RESUME; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_ROLLBACK; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_SET_TIMEOUT; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_START; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_FAILED; +import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND; import java.util.List; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.core.exception.HornetQXAException; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.NullResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.RollbackMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionExpireMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXACommitMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAEndMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAForgetMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAJoinMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAResumeMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXARollbackMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionXAStartMessage; -import org.apache.activemq6.core.remoting.CloseListener; -import org.apache.activemq6.core.remoting.FailureListener; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnection; -import org.apache.activemq6.core.server.BindingQueryResult; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.QueueQueryResult; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.core.exception.HornetQXAException; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSharedQueueMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.NullResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.RollbackMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionExpireMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXACommitMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAEndMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAForgetMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAJoinMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResumeMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXARollbackMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAStartMessage; +import org.apache.activemq.core.remoting.CloseListener; +import org.apache.activemq.core.remoting.FailureListener; +import org.apache.activemq.core.remoting.impl.netty.NettyConnection; +import org.apache.activemq.core.server.BindingQueryResult; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.QueueQueryResult; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.spi.core.remoting.Connection; /** * A ServerSessionPacketHandler http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java index b86078f..04209dc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl; +package org.apache.activemq.core.protocol.core.impl; import java.nio.charset.StandardCharsets; import java.util.List; @@ -20,38 +20,38 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import io.netty.channel.ChannelPipeline; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClusterTopologyListener; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.TopologyMember; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.protocol.ServerPacketDecoder; -import org.apache.activemq6.core.protocol.core.Channel; -import org.apache.activemq6.core.protocol.core.ChannelHandler; -import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.ServerSessionPacketHandler; -import org.apache.activemq6.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; -import org.apache.activemq6.core.protocol.core.impl.wireformat.Ping; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; -import org.apache.activemq6.core.remoting.CloseListener; -import org.apache.activemq6.core.remoting.impl.netty.HornetQFrameDecoder2; -import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.spi.core.protocol.ConnectionEntry; -import org.apache.activemq6.spi.core.protocol.MessageConverter; -import org.apache.activemq6.spi.core.protocol.ProtocolManager; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.spi.core.remoting.Acceptor; -import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClusterTopologyListener; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.protocol.ServerPacketDecoder; +import org.apache.activemq.core.protocol.core.Channel; +import org.apache.activemq.core.protocol.core.ChannelHandler; +import org.apache.activemq.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.ServerSessionPacketHandler; +import org.apache.activemq.core.protocol.core.impl.ChannelImpl.CHANNEL_ID; +import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V2; +import org.apache.activemq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage_V3; +import org.apache.activemq.core.protocol.core.impl.wireformat.Ping; +import org.apache.activemq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessageV2; +import org.apache.activemq.core.remoting.CloseListener; +import org.apache.activemq.core.remoting.impl.netty.HornetQFrameDecoder2; +import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.spi.core.protocol.ConnectionEntry; +import org.apache.activemq.spi.core.protocol.MessageConverter; +import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.spi.core.remoting.Connection; /** * A CoreProtocolManager http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java index 2f65976..43af54c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManagerFactory.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl; +package org.apache.activemq.core.protocol.core.impl; import java.util.List; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.spi.core.protocol.ProtocolManager; -import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; /** * A CoreProtocolManagerFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java index 0405011..f0933fd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreSessionCallback.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl; - -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.core.Channel; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.ServerConsumer; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.spi.core.protocol.ProtocolManager; -import org.apache.activemq6.spi.core.protocol.SessionCallback; -import org.apache.activemq6.spi.core.remoting.ReadyListener; +package org.apache.activemq.core.protocol.core.impl; + +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.core.Channel; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectConsumerMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ServerConsumer; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.spi.core.remoting.ReadyListener; /** * A CoreSessionCallback http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java index f8d4670..33e89e6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java @@ -10,31 +10,31 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.core.Channel; -import org.apache.activemq6.core.protocol.core.ChannelHandler; -import org.apache.activemq6.core.protocol.core.CoreRemotingConnection; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.ServerSessionPacketHandler; -import org.apache.activemq6.core.protocol.core.impl.wireformat.CheckFailoverMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.HornetQExceptionMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReattachSessionMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; -import org.apache.activemq6.core.security.HornetQPrincipal; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.core.version.Version; +package org.apache.activemq.core.protocol.core.impl; + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.core.Channel; +import org.apache.activemq.core.protocol.core.ChannelHandler; +import org.apache.activemq.core.protocol.core.CoreRemotingConnection; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.ServerSessionPacketHandler; +import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.HornetQExceptionMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage; +import org.apache.activemq.core.security.HornetQPrincipal; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.core.version.Version; /** * A packet handler for all packets that need to be handled at the server level http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java index 89edea0..ae6bf6b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * Registers a given backup-server as the replicating backup of a live server (i.e. a regular http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java index c123e4c..cc5d0e6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java @@ -13,10 +13,10 @@ /** * */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; import java.util.Collections; import java.util.EnumSet; @@ -25,7 +25,7 @@ import java.util.Map; /** * Informs the Backup trying to start replicating of an error. - * @see org.apache.activemq6.core.server.impl.ReplicationError + * @see org.apache.activemq.core.server.impl.ReplicationError */ public final class BackupReplicationStartFailedMessage extends PacketImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java index 48480f3..f2b77c8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; public class BackupRequestMessage extends PacketImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java index e1924f0..1666ded 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; public class BackupResponseMessage extends PacketImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java index b9bf077..4203ed6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; public class ClusterConnectMessage extends PacketImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java index 8305690..25dafb8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; public class ClusterConnectReplyMessage extends PacketImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java index 93fe747..932af66 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java index de7a0eb..9bcbd1a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler; -import org.apache.activemq6.core.server.cluster.qourum.Vote; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq.core.server.cluster.qourum.Vote; public class QuorumVoteMessage extends PacketImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java index af20397..fb4e636 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.server.cluster.qourum.QuorumVoteHandler; -import org.apache.activemq6.core.server.cluster.qourum.Vote; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; +import org.apache.activemq.core.server.cluster.qourum.Vote; public class QuorumVoteReplyMessage extends PacketImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java index 246f25d..7e9a119 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; /** * A ReplicationAddMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java index bcec74a..98e8d52 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.replication.ReplicationManager.ADD_OPERATION_TYPE; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; /** * A ReplicationAddMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java index bad53a1..86c2dea 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * A ReplicationAddMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java index 3458c2f..d0efd84 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * A ReplicationDeleteMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java index a1aed0f..e424dd1 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * A ReplicationAddMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java index 37b26bc..0154b04 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * A ReplicationLargeMessageBeingMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java index 815a6c8..2daa969 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * A ReplicationLargemessageEndMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java index b95fab6..286cfaa 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * A ReplicationLargeMessageWriteMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java index 4ce8bf3..1f3f844 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java @@ -13,10 +13,10 @@ /** * */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * Message indicating that the live is stopping (a scheduled stop). http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java index 19bfb5a..8329a5d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * A ReplicationPageWrite http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java index 77a27ba..1e8ac44 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.impl.PagedMessageImpl; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.impl.PagedMessageImpl; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * A ReplicationPageWrite http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java index 82845b2..3793354 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * @author <mailto:[email protected]";>Clebert Suconic</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java index 5f36fa9..ff456e8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationResponseMessage.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java index a3aea5e..ec0e59c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; import java.security.InvalidParameterException; import java.util.Arrays; import java.util.List; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.impl.JournalFile; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.impl.JournalFile; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * This message may signal start or end of the replication synchronization. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java index 60cc5bd..33797ec 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.EnumSet; import java.util.Set; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.JournalContent; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** - * Message is used to sync {@link org.apache.activemq6.core.journal.SequentialFile}s to a backup server. The {@link FileType} controls + * Message is used to sync {@link org.apache.activemq.core.journal.SequentialFile}s to a backup server. The {@link FileType} controls * which extra information is sent. */ public final class ReplicationSyncFileMessage extends PacketImpl @@ -34,7 +34,7 @@ public final class ReplicationSyncFileMessage extends PacketImpl */ private JournalContent journalType; /** - * This value refers to {@link org.apache.activemq6.core.journal.impl.JournalFile#getFileID()}, or the + * This value refers to {@link org.apache.activemq.core.journal.impl.JournalFile#getFileID()}, or the * message id if we are sync'ing a large-message. */ private long fileId; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java index 466cccd..b6ee30b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.core.impl.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; public class ScaleDownAnnounceMessage extends PacketImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java index 760d342..16bd901 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/stomp/WebSocketServerHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.stomp; +package org.apache.activemq.core.protocol.stomp; import java.nio.charset.StandardCharsets; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java b/activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java index 1298f94..2c80442 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/registry/JndiBindingRegistry.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.registry; +package org.apache.activemq.core.registry; -import org.apache.activemq6.spi.core.naming.BindingRegistry; +import org.apache.activemq.spi.core.naming.BindingRegistry; import javax.naming.Context; import javax.naming.InitialContext; @@ -140,7 +140,7 @@ public class JndiBindingRegistry implements BindingRegistry // OK } - Context c = org.apache.activemq6.utils.JNDIUtil.createContext(context, parentContext); + Context c = org.apache.activemq.utils.JNDIUtil.createContext(context, parentContext); c.rebind(jndiNameInContext, objectToBind); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java b/activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java index 0ed2d41..d134582 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/registry/MapBindingRegistry.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.registry; +package org.apache.activemq.core.registry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.activemq6.spi.core.naming.BindingRegistry; +import org.apache.activemq.spi.core.naming.BindingRegistry; /** * @author <a href="mailto:[email protected]";>Bill Burke</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java index 986d8e5..1bc936f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java @@ -10,31 +10,31 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.remoting.impl.invm; +package org.apache.activemq.core.remoting.impl.invm; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.core.security.HornetQPrincipal; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.server.management.NotificationService; -import org.apache.activemq6.spi.core.remoting.Acceptor; -import org.apache.activemq6.spi.core.remoting.BufferHandler; -import org.apache.activemq6.spi.core.remoting.Connection; -import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq6.utils.ConfigurationHelper; -import org.apache.activemq6.utils.ExecutorFactory; -import org.apache.activemq6.utils.OrderedExecutorFactory; -import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.core.security.HornetQPrincipal; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.server.management.NotificationService; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.spi.core.remoting.BufferHandler; +import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.utils.ConfigurationHelper; +import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.utils.OrderedExecutorFactory; +import org.apache.activemq.utils.TypedProperties; /** * A InVMAcceptor http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java index 28edc71..d363d00 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptorFactory.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.remoting.impl.invm; +package org.apache.activemq.core.remoting.impl.invm; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.spi.core.protocol.ProtocolManager; -import org.apache.activemq6.spi.core.remoting.Acceptor; -import org.apache.activemq6.spi.core.remoting.AcceptorFactory; -import org.apache.activemq6.spi.core.remoting.BufferHandler; -import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.spi.core.remoting.AcceptorFactory; +import org.apache.activemq.spi.core.remoting.BufferHandler; +import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; /** * A InVMAcceptorFactory
