http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java index 253f823..e9b9c3a 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.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.openwire; +package org.apache.activemq.core.protocol.openwire; import java.io.IOException; import java.util.ArrayList; @@ -75,29 +75,29 @@ import org.apache.activemq.thread.TaskRunnerFactory; import org.apache.activemq.transport.TransmitCallback; import org.apache.activemq.util.ByteSequence; import org.apache.activemq.wireformat.WireFormat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQSecurityException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.openwire.amq.AMQBrokerStoppedException; -import org.apache.activemq6.core.protocol.openwire.amq.AMQConnectionContext; -import org.apache.activemq6.core.protocol.openwire.amq.AMQConsumerBrokerExchange; -import org.apache.activemq6.core.protocol.openwire.amq.AMQMapTransportConnectionStateRegister; -import org.apache.activemq6.core.protocol.openwire.amq.AMQMessageAuthorizationPolicy; -import org.apache.activemq6.core.protocol.openwire.amq.AMQProducerBrokerExchange; -import org.apache.activemq6.core.protocol.openwire.amq.AMQSession; -import org.apache.activemq6.core.protocol.openwire.amq.AMQSingleTransportConnectionStateRegister; -import org.apache.activemq6.core.protocol.openwire.amq.AMQTransaction; -import org.apache.activemq6.core.protocol.openwire.amq.AMQTransportConnectionState; -import org.apache.activemq6.core.protocol.openwire.amq.AMQTransportConnectionStateRegister; -import org.apache.activemq6.core.remoting.CloseListener; -import org.apache.activemq6.core.remoting.FailureListener; -import org.apache.activemq6.core.server.HornetQServerLogger; -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.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQSecurityException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.openwire.amq.AMQBrokerStoppedException; +import org.apache.activemq.core.protocol.openwire.amq.AMQConnectionContext; +import org.apache.activemq.core.protocol.openwire.amq.AMQConsumerBrokerExchange; +import org.apache.activemq.core.protocol.openwire.amq.AMQMapTransportConnectionStateRegister; +import org.apache.activemq.core.protocol.openwire.amq.AMQMessageAuthorizationPolicy; +import org.apache.activemq.core.protocol.openwire.amq.AMQProducerBrokerExchange; +import org.apache.activemq.core.protocol.openwire.amq.AMQSession; +import org.apache.activemq.core.protocol.openwire.amq.AMQSingleTransportConnectionStateRegister; +import org.apache.activemq.core.protocol.openwire.amq.AMQTransaction; +import org.apache.activemq.core.protocol.openwire.amq.AMQTransportConnectionState; +import org.apache.activemq.core.protocol.openwire.amq.AMQTransportConnectionStateRegister; +import org.apache.activemq.core.remoting.CloseListener; +import org.apache.activemq.core.remoting.FailureListener; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.utils.ConcurrentHashSet; /** * Represents an activemq connection.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.java index 70b98a7..74c5ce4 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireMessageConverter.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.openwire; +package org.apache.activemq.core.protocol.openwire; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -45,16 +45,16 @@ import org.apache.activemq.util.ByteSequence; import org.apache.activemq.util.MarshallingSupport; import org.apache.activemq.wireformat.WireFormat; import org.fusesource.hawtbuf.UTF8Buffer; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQPropertyConversionException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.openwire.amq.AMQConsumer; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.spi.core.protocol.MessageConverter; -import org.apache.activemq6.utils.DataConstants; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.openwire.amq.AMQConsumer; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.spi.core.protocol.MessageConverter; +import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.UUIDGenerator; public class OpenWireMessageConverter implements MessageConverter { @@ -121,14 +121,14 @@ public class OpenWireMessageConverter implements MessageConverter HornetQBuffer body = coreMessage.getBodyBuffer(); switch (coreType) { - case org.apache.activemq6.api.core.Message.TEXT_TYPE: + case org.apache.activemq.api.core.Message.TEXT_TYPE: ByteArrayInputStream tis = new ByteArrayInputStream(contents); DataInputStream tdataIn = new DataInputStream(tis); String text = MarshallingSupport.readUTF8(tdataIn); tdataIn.close(); body.writeNullableSimpleString(new SimpleString(text)); break; - case org.apache.activemq6.api.core.Message.MAP_TYPE: + case org.apache.activemq.api.core.Message.MAP_TYPE: InputStream mis = new ByteArrayInputStream(contents); DataInputStream mdataIn = new DataInputStream(mis); Map<String, Object> map = MarshallingSupport.unmarshalPrimitiveMap(mdataIn); @@ -137,11 +137,11 @@ public class OpenWireMessageConverter implements MessageConverter loadMapIntoProperties(props, map); props.encode(body); break; - case org.apache.activemq6.api.core.Message.OBJECT_TYPE: + case org.apache.activemq.api.core.Message.OBJECT_TYPE: body.writeInt(contents.length); body.writeBytes(contents.data, contents.offset, contents.length); break; - case org.apache.activemq6.api.core.Message.STREAM_TYPE: + case org.apache.activemq.api.core.Message.STREAM_TYPE: InputStream sis = new ByteArrayInputStream(contents); DataInputStream sdis = new DataInputStream(sis); int stype = sdis.read(); @@ -384,17 +384,17 @@ public class OpenWireMessageConverter implements MessageConverter case CommandTypes.ACTIVEMQ_BLOB_MESSAGE: throw new IllegalStateException("We don't support BLOB type yet!"); case CommandTypes.ACTIVEMQ_BYTES_MESSAGE: - return org.apache.activemq6.api.core.Message.BYTES_TYPE; + return org.apache.activemq.api.core.Message.BYTES_TYPE; case CommandTypes.ACTIVEMQ_MAP_MESSAGE: - return org.apache.activemq6.api.core.Message.MAP_TYPE; + return org.apache.activemq.api.core.Message.MAP_TYPE; case CommandTypes.ACTIVEMQ_OBJECT_MESSAGE: - return org.apache.activemq6.api.core.Message.OBJECT_TYPE; + return org.apache.activemq.api.core.Message.OBJECT_TYPE; case CommandTypes.ACTIVEMQ_STREAM_MESSAGE: - return org.apache.activemq6.api.core.Message.STREAM_TYPE; + return org.apache.activemq.api.core.Message.STREAM_TYPE; case CommandTypes.ACTIVEMQ_TEXT_MESSAGE: - return org.apache.activemq6.api.core.Message.TEXT_TYPE; + return org.apache.activemq.api.core.Message.TEXT_TYPE; case CommandTypes.ACTIVEMQ_MESSAGE: - return org.apache.activemq6.api.core.Message.DEFAULT_TYPE; + return org.apache.activemq.api.core.Message.DEFAULT_TYPE; default: throw new IllegalStateException("Unknown ActiveMQ message type: " + amqType); } @@ -421,22 +421,22 @@ public class OpenWireMessageConverter implements MessageConverter byte coreType = coreMessage.getType(); switch (coreType) { - case org.apache.activemq6.api.core.Message.BYTES_TYPE: + case org.apache.activemq.api.core.Message.BYTES_TYPE: amqMsg = new ActiveMQBytesMessage(); break; - case org.apache.activemq6.api.core.Message.MAP_TYPE: + case org.apache.activemq.api.core.Message.MAP_TYPE: amqMsg = new ActiveMQMapMessage(); break; - case org.apache.activemq6.api.core.Message.OBJECT_TYPE: + case org.apache.activemq.api.core.Message.OBJECT_TYPE: amqMsg = new ActiveMQObjectMessage(); break; - case org.apache.activemq6.api.core.Message.STREAM_TYPE: + case org.apache.activemq.api.core.Message.STREAM_TYPE: amqMsg = new ActiveMQStreamMessage(); break; - case org.apache.activemq6.api.core.Message.TEXT_TYPE: + case org.apache.activemq.api.core.Message.TEXT_TYPE: amqMsg = new ActiveMQTextMessage(); break; - case org.apache.activemq6.api.core.Message.DEFAULT_TYPE: + case org.apache.activemq.api.core.Message.DEFAULT_TYPE: amqMsg = new ActiveMQMessage(); break; default: @@ -467,7 +467,7 @@ public class OpenWireMessageConverter implements MessageConverter byte[] bytes = null; synchronized (buffer) { - if (coreType == org.apache.activemq6.api.core.Message.TEXT_TYPE) + if (coreType == org.apache.activemq.api.core.Message.TEXT_TYPE) { SimpleString text = buffer.readNullableSimpleString(); @@ -480,7 +480,7 @@ public class OpenWireMessageConverter implements MessageConverter out.close(); } } - else if (coreType == org.apache.activemq6.api.core.Message.MAP_TYPE) + else if (coreType == org.apache.activemq.api.core.Message.MAP_TYPE) { TypedProperties mapData = new TypedProperties(); mapData.decode(buffer); @@ -492,13 +492,13 @@ public class OpenWireMessageConverter implements MessageConverter bytes = out.toByteArray(); dataOut.close(); } - else if (coreType == org.apache.activemq6.api.core.Message.OBJECT_TYPE) + else if (coreType == org.apache.activemq.api.core.Message.OBJECT_TYPE) { int len = buffer.readInt(); bytes = new byte[len]; buffer.readBytes(bytes); } - else if (coreType == org.apache.activemq6.api.core.Message.STREAM_TYPE) + else if (coreType == org.apache.activemq.api.core.Message.STREAM_TYPE) { ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.readableBytes()); DataOutputStream dataOut = new DataOutputStream(out); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java index 2e9a4e1..1bc5a40 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.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.openwire; +package org.apache.activemq.core.protocol.openwire; import java.util.ArrayList; import java.util.Collections; @@ -57,27 +57,27 @@ import org.apache.activemq.state.SessionState; import org.apache.activemq.util.IdGenerator; import org.apache.activemq.util.InetAddressUtil; import org.apache.activemq.util.LongSequenceGenerator; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.protocol.openwire.amq.AMQConnectionContext; -import org.apache.activemq6.core.protocol.openwire.amq.AMQPersistenceAdapter; -import org.apache.activemq6.core.protocol.openwire.amq.AMQProducerBrokerExchange; -import org.apache.activemq6.core.protocol.openwire.amq.AMQServerSession; -import org.apache.activemq6.core.protocol.openwire.amq.AMQSession; -import org.apache.activemq6.core.protocol.openwire.amq.AMQTransportConnectionState; -import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq6.core.security.CheckType; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -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.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.protocol.openwire.amq.AMQConnectionContext; +import org.apache.activemq.core.protocol.openwire.amq.AMQPersistenceAdapter; +import org.apache.activemq.core.protocol.openwire.amq.AMQProducerBrokerExchange; +import org.apache.activemq.core.protocol.openwire.amq.AMQServerSession; +import org.apache.activemq.core.protocol.openwire.amq.AMQSession; +import org.apache.activemq.core.protocol.openwire.amq.AMQTransportConnectionState; +import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +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; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; public class OpenWireProtocolManager implements ProtocolManager { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.java index d9bdc71..25c5a46 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManagerFactory.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.openwire; +package org.apache.activemq.core.protocol.openwire; import java.util.List; -import org.apache.activemq6.api.core.Interceptor; -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.core.server.HornetQServer; +import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; /** * A OpenWireProtocolManagerFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java index 028e549..cc5a6bb 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.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.openwire; +package org.apache.activemq.core.protocol.openwire; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.util.ByteSequence; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.SimpleString; public class OpenWireUtil { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.java index 4e8c553..628932d 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/SendingResult.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.openwire; +package org.apache.activemq.core.protocol.openwire; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.paging.impl.PagingStoreImpl; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.paging.impl.PagingStoreImpl; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; /** * @author <a href="mailto:[email protected]";>Howard Gao</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java index fca3b66..6864f74 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQAbstractDeadLetterStrategy.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.ActiveMQMessageAudit; import org.apache.activemq.command.Message; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.java index 3d29f10..a9c243f 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQBrokerStoppedException.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; public class AMQBrokerStoppedException extends IllegalStateException { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.java index b0eece4..4808022 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectionContext.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; @@ -24,8 +24,8 @@ import org.apache.activemq.command.WireFormatInfo; import org.apache.activemq.command.XATransactionId; import org.apache.activemq.filter.MessageEvaluationContext; import org.apache.activemq.state.ConnectionState; -import org.apache.activemq6.core.protocol.openwire.OpenWireConnection; -import org.apache.activemq6.core.protocol.openwire.OpenWireProtocolManager; +import org.apache.activemq.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq.core.protocol.openwire.OpenWireProtocolManager; public class AMQConnectionContext { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.java index 41ce043..89f8d9a 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnector.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.command.BrokerInfo; import org.apache.activemq.command.ConnectionControl; -import org.apache.activemq6.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq.core.protocol.openwire.OpenWireConnection; public interface AMQConnector { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.java index 64bce2b..301d2f9 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConnectorStatistics.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.management.CountStatisticImpl; import org.apache.activemq.management.PollCountStatisticImpl; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.java index 01e1c0b..9e98de2 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumer.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.io.IOException; import java.util.Iterator; @@ -27,12 +27,12 @@ import org.apache.activemq.command.MessageDispatch; import org.apache.activemq.command.MessageId; import org.apache.activemq.command.TransactionId; import org.apache.activemq.wireformat.WireFormat; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.openwire.OpenWireMessageConverter; -import org.apache.activemq6.core.protocol.openwire.OpenWireUtil; -import org.apache.activemq6.core.server.QueueQueryResult; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.jms.client.HornetQDestination; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.openwire.OpenWireMessageConverter; +import org.apache.activemq.core.protocol.openwire.OpenWireUtil; +import org.apache.activemq.core.server.QueueQueryResult; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.jms.client.HornetQDestination; public class AMQConsumer implements BrowserListener { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java index cf2d6f9..89d5930 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQConsumerBrokerExchange.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; public class AMQConsumerBrokerExchange { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java index 8467c9a..4c04139 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDeadLetterStrategy.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.java index 6042b78..b771979 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestination.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.io.IOException; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.java index 6294db2..38fbc1b 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQDestinationStatistics.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.management.CountStatisticImpl; import org.apache.activemq.management.PollCountStatisticImpl; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java index 595cd30..c0638f9 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMapTransportConnectionStateRegister.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.util.ArrayList; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java index 48996f6..669d464 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageAuthorizationPolicy.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.command.Message; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.java index 5d5caf8..45626df 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQMessageStore.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; public interface AMQMessageStore { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.java index 7a9a5ab..3cc587b 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQPersistenceAdapter.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.io.IOException; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java index c20725c..e74032f 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.command.ProducerInfo; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java index d86e418..454400b 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducerBrokerExchange.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.java index 7724890..b1ce97a 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSecurityContext.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.security.Principal; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java index a753d8d..5a1bcfc 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerConsumer.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.util.List; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.protocol.openwire.OpenWireMessageConverter; -import org.apache.activemq6.core.server.HandleStatus; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.QueueImpl; -import org.apache.activemq6.core.server.impl.ServerConsumerImpl; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.protocol.openwire.OpenWireMessageConverter; +import org.apache.activemq.core.server.HandleStatus; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.QueueImpl; +import org.apache.activemq.core.server.impl.ServerConsumerImpl; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.spi.core.protocol.SessionCallback; public class AMQServerConsumer extends ServerConsumerImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.java index e265f99..1eb47c9 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSession.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.util.ArrayList; import java.util.HashMap; @@ -22,38 +22,38 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.filter.impl.FilterImpl; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.BindingType; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.protocol.openwire.AMQTransactionImpl; -import org.apache.activemq6.core.security.SecurityStore; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerConsumer; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.RefsOperation; -import org.apache.activemq6.core.server.impl.ServerConsumerImpl; -import org.apache.activemq6.core.server.impl.ServerSessionImpl; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.spi.core.protocol.SessionCallback; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.UUID; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.filter.impl.FilterImpl; +import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.BindingType; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.protocol.openwire.AMQTransactionImpl; +import org.apache.activemq.core.security.SecurityStore; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerConsumer; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.RefsOperation; +import org.apache.activemq.core.server.impl.ServerConsumerImpl; +import org.apache.activemq.core.server.impl.ServerSessionImpl; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.UUID; public class AMQServerSession extends ServerSessionImpl { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.java index 7073450..bb3f4b8 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQServerSessionFactory.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.security.SecurityStore; -import org.apache.activemq6.core.server.ServerSessionFactory; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.ServerSessionImpl; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.spi.core.protocol.SessionCallback; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.security.SecurityStore; +import org.apache.activemq.core.server.ServerSessionFactory; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.ServerSessionImpl; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.protocol.SessionCallback; public class AMQServerSessionFactory implements ServerSessionFactory { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java index 5b67552..d74e091 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.io.IOException; import java.util.HashMap; @@ -43,21 +43,21 @@ import org.apache.activemq.command.TransactionId; import org.apache.activemq.command.TransactionInfo; import org.apache.activemq.command.XATransactionId; import org.apache.activemq.wireformat.WireFormat; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.paging.impl.PagingStoreImpl; -import org.apache.activemq6.core.protocol.openwire.OpenWireConnection; -import org.apache.activemq6.core.protocol.openwire.OpenWireMessageConverter; -import org.apache.activemq6.core.protocol.openwire.OpenWireProtocolManager; -import org.apache.activemq6.core.protocol.openwire.OpenWireUtil; -import org.apache.activemq6.core.protocol.openwire.SendingResult; -import org.apache.activemq6.core.server.HornetQServer; -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.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.core.transaction.impl.XidImpl; -import org.apache.activemq6.spi.core.protocol.SessionCallback; -import org.apache.activemq6.spi.core.remoting.ReadyListener; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.paging.impl.PagingStoreImpl; +import org.apache.activemq.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq.core.protocol.openwire.OpenWireMessageConverter; +import org.apache.activemq.core.protocol.openwire.OpenWireProtocolManager; +import org.apache.activemq.core.protocol.openwire.OpenWireUtil; +import org.apache.activemq.core.protocol.openwire.SendingResult; +import org.apache.activemq.core.server.HornetQServer; +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.core.server.impl.ServerMessageImpl; +import org.apache.activemq.core.transaction.impl.XidImpl; +import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.spi.core.remoting.ReadyListener; public class AMQSession implements SessionCallback { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java index db57c23..40aa6b8 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSharedDeadLetterStrategy.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java index f9ba807..2d0f399 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSingleTransportConnectionStateRegister.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.util.ArrayList; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java index 3a94c4b..d7fed51 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSlowConsumerStrategy.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; public interface AMQSlowConsumerStrategy { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.java index 011202b..a5e26ef 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscription.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.io.IOException; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java index eb94a28..ab2f50f 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSubscriptionRecovery.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.broker.region.MessageReference; import org.apache.activemq.command.ActiveMQDestination; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.java index a4fc76d..9fe251b 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransaction.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.java index 3577422..9648dd6 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransactionFactory.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import javax.transaction.xa.Xid; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.protocol.openwire.AMQTransactionImpl; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionFactory; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.protocol.openwire.AMQTransactionImpl; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionFactory; public class AMQTransactionFactory implements TransactionFactory { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.java index 2cdeb75..ddadd83 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionState.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.command.ConnectionInfo; import org.apache.activemq.state.ConnectionState; -import org.apache.activemq6.core.protocol.openwire.OpenWireConnection; +import org.apache.activemq.core.protocol.openwire.OpenWireConnection; /** * @See org.apache.activemq.broker.TransportConnectionState http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java index 272558f..1559258 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQTransportConnectionStateRegister.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.java index 6713712..1979469 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/BrowserListener.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; interface BrowserListener { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.java index ca9884d..41d5776 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/MessageInfo.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.openwire.amq; +package org.apache.activemq.core.protocol.openwire.amq; import org.apache.activemq.command.MessageId; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory b/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory index a821402..82f81bf 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory +++ b/activemq-protocols/activemq-openwire-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory @@ -1 +1 @@ -org.apache.activemq6.core.protocol.openwire.OpenWireProtocolManagerFactory +org.apache.activemq.core.protocol.openwire.OpenWireProtocolManagerFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-proton-plug/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml index 0031bac..f60bc40 100644 --- a/activemq-protocols/activemq-proton-plug/pom.xml +++ b/activemq-protocols/activemq-proton-plug/pom.xml @@ -1,13 +1,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>activemq6-protocols</artifactId> - <groupId>org.apache.activemq6</groupId> + <artifactId>activemq-protocols</artifactId> + <groupId>org.apache.activemq</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>activemq6-proton-plug</artifactId> + <artifactId>activemq-proton-plug</artifactId> <properties> <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> @@ -16,13 +16,13 @@ <dependencies> <!-- JMS Client because of some Convertions that are done --> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-core-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -38,8 +38,8 @@ <artifactId>jboss-logging</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-stomp-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/pom.xml b/activemq-protocols/activemq-stomp-protocol/pom.xml index 574dd68..d52bbb0 100644 --- a/activemq-protocols/activemq-stomp-protocol/pom.xml +++ b/activemq-protocols/activemq-stomp-protocol/pom.xml @@ -1,13 +1,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>activemq6-protocols</artifactId> - <groupId>org.apache.activemq6</groupId> + <artifactId>activemq-protocols</artifactId> + <groupId>org.apache.activemq</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>activemq6-stomp-protocol</artifactId> + <artifactId>activemq-stomp-protocol</artifactId> <properties> <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> @@ -27,8 +27,8 @@ <artifactId>jboss-logging</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.java index d31c4b4..324c013 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/FrameEventListener.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; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompException.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompException.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompException.java index f5f2a2a..82b775d 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompException.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompException.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; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolLogger.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolLogger.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolLogger.java index 7f5d71d..a30f403 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolLogger.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolLogger.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 org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java index fabcd87..d895c47 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/HornetQStompProtocolMessageBundle.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.stomp; +package org.apache.activemq.core.protocol.stomp; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq.core.server.impl.ServerMessageImpl; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.java index a4ca064..b5fc518 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/SimpleBytes.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-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.java index cd84bba..23c3700 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/Stomp.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; /** * The standard verbs and headers used for the <a href="http://stomp.codehaus.org/";>STOMP</a> protocol. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.java index 2d587fd..6818598 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompCommands.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; public enum StompCommands { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.java index 8d42133..49b3450 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompConnection.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.util.ArrayList; import java.util.Collections; @@ -20,25 +20,25 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.concurrent.CopyOnWriteArrayList; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.core.protocol.stomp.v10.StompFrameHandlerV10; -import org.apache.activemq6.core.protocol.stomp.v12.StompFrameHandlerV12; -import org.apache.activemq6.core.remoting.CloseListener; -import org.apache.activemq6.core.remoting.FailureListener; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -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.activemq6.utils.ConfigurationHelper; -import org.apache.activemq6.utils.VersionLoader; - -import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.core.protocol.stomp.v10.StompFrameHandlerV10; +import org.apache.activemq.core.protocol.stomp.v12.StompFrameHandlerV12; +import org.apache.activemq.core.remoting.CloseListener; +import org.apache.activemq.core.remoting.FailureListener; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.utils.ConfigurationHelper; +import org.apache.activemq.utils.VersionLoader; + +import static org.apache.activemq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * A StompConnection
