http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java index 7bea576..259a188 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java index 433cfef..a6cb077 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.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.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.DataConstants; /** * A SessionContinuationMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java index 7ba0b85..5e572ce 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java index 088aefe..1d14c8a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java index 234ff58..f8368fb 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java index c9b9d54..c5b986a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.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; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java index 4186539..9d4b58c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java index 198bfff..5814942 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.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; /** * @author Justin Bertram http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java index 0446d29..164830e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java index d2dbfbb..6f0306f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.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; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java index 8dec378..ad5e400 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.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; - -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.core.client.impl.QueueQueryImpl; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.server.QueueQueryResult; +package org.apache.activemq.core.protocol.core.impl.wireformat; + +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.core.client.impl.QueueQueryImpl; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.server.QueueQueryResult; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java index 1eb6c1d..c718caf 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.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.core.client.impl.ClientLargeMessageInternal; -import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.client.impl.ClientLargeMessageInternal; +import org.apache.activemq.core.message.impl.MessageInternal; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java index 83f6c90..484a48a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.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.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.utils.DataConstants; /** * A SessionSendContinuationMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java index 7d872e8..d04df3a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.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.message.impl.MessageInternal; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** * A SessionReceiveLargeMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java index 87b6966..73d66c8 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.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.message.impl.MessageInternal; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.utils.DataConstants; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java index 992a507..199f70d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java index 7fd903f..8b267e1 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.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.client.SendAcknowledgementHandler; -import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.core.message.impl.MessageInternal; /** * A SessionSendContinuationMessage<br> @@ -29,12 +29,12 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage // Used on confirmation handling private MessageInternal message; /** - * In case, we are using a different handler than the one set on the {@link org.apache.activemq6.api.core.client.ClientSession} + * In case, we are using a different handler than the one set on the {@link org.apache.activemq.api.core.client.ClientSession} * <p/> * This field is only used at the client side. * - * @see org.apache.activemq6.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) - * @see org.apache.activemq6.api.core.client.ClientProducer#send(org.apache.activemq6.api.core.SimpleString, org.apache.activemq6.api.core.Message, SendAcknowledgementHandler) + * @see org.apache.activemq.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) + * @see org.apache.activemq.api.core.client.ClientProducer#send(org.apache.activemq.api.core.SimpleString, org.apache.activemq.api.core.Message, SendAcknowledgementHandler) */ private final transient SendAcknowledgementHandler handler; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java index 7857bae..143e443 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.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.message.impl.MessageInternal; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.message.impl.MessageInternal; +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-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java index 9c2cc74..48503ce 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.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.client.SendAcknowledgementHandler; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.client.SendAcknowledgementHandler; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.utils.DataConstants; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> @@ -27,12 +27,12 @@ public class SessionSendMessage extends MessagePacket private boolean requiresResponse; /** - * In case, we are using a different handler than the one set on the {@link org.apache.activemq6.api.core.client.ClientSession} + * In case, we are using a different handler than the one set on the {@link org.apache.activemq.api.core.client.ClientSession} * <p/> * This field is only used at the client side. * - * @see org.apache.activemq6.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) - * @see org.apache.activemq6.api.core.client.ClientProducer#send(org.apache.activemq6.api.core.SimpleString, org.apache.activemq6.api.core.Message, SendAcknowledgementHandler) + * @see org.apache.activemq.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) + * @see org.apache.activemq.api.core.client.ClientProducer#send(org.apache.activemq.api.core.SimpleString, org.apache.activemq.api.core.Message, SendAcknowledgementHandler) */ private final transient SendAcknowledgementHandler handler; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java index 6b86bfc..f2d98cc 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.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.wireformat; +package org.apache.activemq.core.protocol.core.impl.wireformat; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java index 9ebd029..bae684a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.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 javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * to be called after a failure on an XA Session http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java index 1fe0acf..42ca620 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.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 javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java index 8c75fb7..c51e771 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.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 javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java index 51269e2..e8d2e90 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.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 javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java index 0bd0dde..51decb9 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.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.util.ArrayList; import java.util.List; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java index 773fdd5..5e1983a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java index af64efe..1229a47 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.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 javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java index 7b014d2..98f5707 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.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 javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java index 36e6b70..f0a530e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java index 6dd712c..ddfe9e2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.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 javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java index fc0679a..1195bf7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.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 javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java index 94b5f28..d266085 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java index 4ac036e..5ef2256 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java index ad2a73b..9491440 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.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 javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.utils.XidCodecSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.utils.XidCodecSupport; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java index d838779..e12ff30 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.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; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java index a129ce0..5e3a56f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.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.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffer; /** * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.java index ea74b0e..eb46d4b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/CloseListener.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.remoting; +package org.apache.activemq.core.remoting; /** - * CloseListeners can be registered with a {@link org.apache.activemq6.spi.core.protocol.RemotingConnection} to get notified when the connection is closed. + * CloseListeners can be registered with a {@link org.apache.activemq.spi.core.protocol.RemotingConnection} to get notified when the connection is closed. * <p> - * {@link org.apache.activemq6.spi.core.protocol.RemotingConnection#addCloseListener(CloseListener)} + * {@link org.apache.activemq.spi.core.protocol.RemotingConnection#addCloseListener(CloseListener)} * * @author <a href="mailto:[email protected]";>Andy Taylor</a> */ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java index 7274f14..cf52280 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.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.remoting; +package org.apache.activemq.core.remoting; -import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQException; /** * A FailureListener notifies the user when a connection failure occurred. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java index 66e1e27..0f4182a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/TransportConfigurationUtil.java @@ -11,15 +11,15 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.remoting.impl; +package org.apache.activemq.core.remoting.impl; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Map; -import org.apache.activemq6.api.core.TransportConfigurationHelper; -import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq.api.core.TransportConfigurationHelper; +import org.apache.activemq.utils.ClassloadingUtil; /** * Stores static mappings of class names to ConnectorFactory instances to act as a central repo for ConnectorFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java index 7890953..ed6bf75 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.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.remoting.impl.netty; +package org.apache.activemq.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java index 5cbcb14..543b925 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.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.netty; +package org.apache.activemq.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.group.ChannelGroup; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; -import org.apache.activemq6.core.client.HornetQClientLogger; -import org.apache.activemq6.core.client.HornetQClientMessageBundle; -import org.apache.activemq6.spi.core.remoting.BufferHandler; -import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.core.client.HornetQClientLogger; +import org.apache.activemq.core.client.HornetQClientMessageBundle; +import org.apache.activemq.spi.core.remoting.BufferHandler; +import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java index 31f9c80..17b5fc7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.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.remoting.impl.netty; +package org.apache.activemq.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.utils.DataConstants; /** * A Netty decoder specially optimised to to decode messages on the core protocol only http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java index 015a864..fbfef29 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.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.remoting.impl.netty; +package org.apache.activemq.core.remoting.impl.netty; import java.net.SocketAddress; import java.util.Map; @@ -24,18 +24,18 @@ import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelPromise; import io.netty.channel.EventLoop; import io.netty.handler.ssl.SslHandler; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.HornetQInterruptedException; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; -import org.apache.activemq6.core.client.HornetQClientLogger; -import org.apache.activemq6.core.security.HornetQPrincipal; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.spi.core.remoting.Connection; -import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq6.spi.core.remoting.ReadyListener; -import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.core.client.HornetQClientLogger; +import org.apache.activemq.core.security.HornetQPrincipal; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.spi.core.remoting.ReadyListener; +import org.apache.activemq.utils.ConcurrentHashSet; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java index 569ae20..b4fa9c2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java @@ -23,7 +23,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.remoting.impl.netty; +package org.apache.activemq.core.remoting.impl.netty; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; @@ -95,23 +95,23 @@ import io.netty.util.AttributeKey; import io.netty.util.ResourceLeakDetector; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GlobalEventExecutor; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.client.HornetQClientLogger; -import org.apache.activemq6.core.client.HornetQClientMessageBundle; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq6.core.protocol.core.impl.HornetQClientProtocolManager; -import org.apache.activemq6.core.remoting.impl.ssl.SSLSupport; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.spi.core.remoting.AbstractConnector; -import org.apache.activemq6.spi.core.remoting.BufferHandler; -import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; -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.FutureLatch; - -import static org.apache.activemq6.utils.Base64.encodeBytes; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.client.HornetQClientLogger; +import org.apache.activemq.core.client.HornetQClientMessageBundle; +import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.core.protocol.core.impl.HornetQClientProtocolManager; +import org.apache.activemq.core.remoting.impl.ssl.SSLSupport; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.spi.core.remoting.AbstractConnector; +import org.apache.activemq.spi.core.remoting.BufferHandler; +import org.apache.activemq.spi.core.remoting.ClientProtocolManager; +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.FutureLatch; + +import static org.apache.activemq.utils.Base64.encodeBytes; /** * A NettyConnector @@ -128,12 +128,12 @@ public class NettyConnector extends AbstractConnector public static final String JAVAX_KEYSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.keyStorePassword"; public static final String JAVAX_TRUSTSTORE_PATH_PROP_NAME = "javax.net.ssl.trustStore"; public static final String JAVAX_TRUSTSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.trustStorePassword"; - public static final String HORNETQ_KEYSTORE_PROVIDER_PROP_NAME = "org.apache.activemq6.ssl.keyStoreProvider"; - public static final String HORNETQ_KEYSTORE_PATH_PROP_NAME = "org.apache.activemq6.ssl.keyStore"; - public static final String HORNETQ_KEYSTORE_PASSWORD_PROP_NAME = "org.apache.activemq6.ssl.keyStorePassword"; - public static final String HORNETQ_TRUSTSTORE_PROVIDER_PROP_NAME = "org.apache.activemq6.ssl.trustStoreProvider"; - public static final String HORNETQ_TRUSTSTORE_PATH_PROP_NAME = "org.apache.activemq6.ssl.trustStore"; - public static final String HORNETQ_TRUSTSTORE_PASSWORD_PROP_NAME = "org.apache.activemq6.ssl.trustStorePassword"; + public static final String HORNETQ_KEYSTORE_PROVIDER_PROP_NAME = "org.apache.activemq.ssl.keyStoreProvider"; + public static final String HORNETQ_KEYSTORE_PATH_PROP_NAME = "org.apache.activemq.ssl.keyStore"; + public static final String HORNETQ_KEYSTORE_PASSWORD_PROP_NAME = "org.apache.activemq.ssl.keyStorePassword"; + public static final String HORNETQ_TRUSTSTORE_PROVIDER_PROP_NAME = "org.apache.activemq.ssl.trustStoreProvider"; + public static final String HORNETQ_TRUSTSTORE_PATH_PROP_NAME = "org.apache.activemq.ssl.trustStore"; + public static final String HORNETQ_TRUSTSTORE_PASSWORD_PROP_NAME = "org.apache.activemq.ssl.trustStorePassword"; // Constants for HTTP upgrade // These constants are exposed publicly as they are used on the server-side to fetch http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java index e2c31b6..28a8e52 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnectorFactory.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.remoting.impl.netty; +package org.apache.activemq.core.remoting.impl.netty; import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq6.spi.core.remoting.BufferHandler; -import org.apache.activemq6.spi.core.remoting.ClientProtocolManager; -import org.apache.activemq6.spi.core.remoting.ConnectionLifeCycleListener; -import org.apache.activemq6.spi.core.remoting.Connector; -import org.apache.activemq6.spi.core.remoting.ConnectorFactory; +import org.apache.activemq.spi.core.remoting.BufferHandler; +import org.apache.activemq.spi.core.remoting.ClientProtocolManager; +import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; +import org.apache.activemq.spi.core.remoting.Connector; +import org.apache.activemq.spi.core.remoting.ConnectorFactory; /** * A NettyConnectorFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java index 6c481c6..7648af3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/PartialPooledByteBufAllocator.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.remoting.impl.netty; +package org.apache.activemq.core.remoting.impl.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java index f7ed135..07fc89b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/SharedNioEventLoopGroup.java @@ -23,15 +23,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.remoting.impl.netty; +package org.apache.activemq.core.remoting.impl.netty; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.FutureListener; import io.netty.util.concurrent.ImmediateEventExecutor; import io.netty.util.concurrent.Promise; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq6.utils.HornetQThreadFactory; +import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.utils.HornetQThreadFactory; import java.security.AccessController; import java.security.PrivilegedAction; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java index 990e99e..c81db4d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.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.remoting.impl.netty; +package org.apache.activemq.core.remoting.impl.netty; import java.util.Collections; import java.util.HashSet; import java.util.Set; import io.netty.util.Version; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; /** * A TransportConstants http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.java index f2036af..7fab3cf 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/ssl/SSLSupport.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.remoting.impl.ssl; +package org.apache.activemq.core.remoting.impl.ssl; import java.io.File; import java.io.IOException; @@ -28,7 +28,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; -import org.apache.activemq6.utils.ClassloadingUtil; +import org.apache.activemq.utils.ClassloadingUtil; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java index 457daae..38339fc 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/package-info.java @@ -15,5 +15,5 @@ * <br> * This package defines the API used by HornetQ for remoting. */ -package org.apache.activemq6.core.remoting; +package org.apache.activemq.core.remoting; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/security/HornetQPrincipal.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/security/HornetQPrincipal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/security/HornetQPrincipal.java index 94f6752..b3e16fa 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/security/HornetQPrincipal.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/security/HornetQPrincipal.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.security; +package org.apache.activemq.core.security; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.java b/activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.java index 30348cb..20d2c0d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/security/Role.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.security; +package org.apache.activemq.core.security; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.java b/activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.java index 9fba0b8..923e132 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/server/QueueQueryResult.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.server; +package org.apache.activemq.core.server; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.SimpleString; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.java b/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.java index 214dfdf..62d59d9 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/Notification.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.server.management; +package org.apache.activemq.core.server.management; -import org.apache.activemq6.api.core.management.NotificationType; -import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq.api.core.management.NotificationType; +import org.apache.activemq.utils.TypedProperties; /** * A Notification - * @see org.apache.activemq6.core.server.management.NotificationListener + * @see org.apache.activemq.core.server.management.NotificationListener * @see NotificationType * @author <a href="mailto:[email protected]";>Tim Fox</a> Created 22 Jan 2009 16:41:12 */ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.java b/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.java index f20b1af..f928970 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationListener.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.server.management; +package org.apache.activemq.core.server.management; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.java b/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.java index 8cedaff..5f43c87 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/server/management/NotificationService.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.server.management; +package org.apache.activemq.core.server.management; /** * A NotificationService http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.java b/activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.java index 2904027..7576c5e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/settings/impl/AddressFullMessagePolicy.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.settings.impl; +package org.apache.activemq.core.settings.impl; /** * A AddressFullMessagePolicy http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.java index e2963a7..11dc1ae 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/transaction/impl/XidImpl.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.transaction.impl; +package org.apache.activemq.core.transaction.impl; import java.io.Serializable; import java.util.Arrays; import javax.transaction.xa.Xid; -import org.apache.activemq6.utils.Base64; +import org.apache.activemq.utils.Base64; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java b/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java index 783a7a6..c83923a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/version/Version.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.version; +package org.apache.activemq.core.version; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java index 7295dfb..418b0c3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/version/impl/VersionImpl.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.version.impl; +package org.apache.activemq.core.version.impl; import java.io.Serializable; import java.util.Arrays; -import org.apache.activemq6.core.version.Version; +import org.apache.activemq.core.version.Version; /** * A VersionImpl
