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/StompDecoder.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompDecoder.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompDecoder.java index 3b31491..fbeb208 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompDecoder.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompDecoder.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.stomp; +package org.apache.activemq.core.protocol.stomp; import java.util.HashMap; import java.util.Map; -import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffer; -import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * A StompDecoder
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/StompFrame.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrame.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrame.java index 5867e20..5e978bf 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrame.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompFrame.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.stomp; +package org.apache.activemq.core.protocol.stomp; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; /** * Represents all the data in a STOMP frame. 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/StompProtocolManager.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java index 0e10f39..afbf0c2 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.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.HashMap; @@ -23,36 +23,36 @@ import java.util.concurrent.Executor; import io.netty.channel.ChannelPipeline; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.postoffice.BindingType; -import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.server.management.NotificationListener; -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.activemq6.utils.ConcurrentHashSet; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.UUIDGenerator; - -import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.postoffice.BindingType; +import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.server.management.NotificationListener; +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; +import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.UUIDGenerator; + +import static org.apache.activemq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * StompProtocolManager 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/StompProtocolManagerFactory.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManagerFactory.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManagerFactory.java index ae42dad..60f5810 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManagerFactory.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManagerFactory.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.stomp; +package org.apache.activemq.core.protocol.stomp; 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 StompProtocolManagerFactory 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/StompSession.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSession.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSession.java index 4ed40e3..cdc0b3f 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSession.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSession.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.Iterator; import java.util.Map; @@ -18,30 +18,30 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.zip.Inflater; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.message.BodyEncoder; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageImpl; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.QueueQueryResult; -import org.apache.activemq6.core.server.ServerConsumer; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.core.server.impl.ServerSessionImpl; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.spi.core.protocol.SessionCallback; -import org.apache.activemq6.spi.core.remoting.ReadyListener; -import org.apache.activemq6.utils.ConfigurationHelper; -import org.apache.activemq6.utils.UUIDGenerator; - -import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.message.BodyEncoder; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.core.server.QueueQueryResult; +import org.apache.activemq.core.server.ServerConsumer; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.core.server.impl.ServerSessionImpl; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.spi.core.remoting.ReadyListener; +import org.apache.activemq.utils.ConfigurationHelper; +import org.apache.activemq.utils.UUIDGenerator; + +import static org.apache.activemq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * A StompSession 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/StompSubscription.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSubscription.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSubscription.java index 3d6ad9f..e6b29b0 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSubscription.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompSubscription.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; /** * A StompSubscription 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/StompUtils.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompUtils.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompUtils.java index 3b60fbb..9ba9813 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompUtils.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompUtils.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.protocol.stomp; +package org.apache.activemq.core.protocol.stomp; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.client.impl.ClientMessageImpl; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.client.impl.ClientMessageImpl; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.core.server.impl.ServerMessageImpl; /** * A StompUtils 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/StompVersions.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompVersions.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompVersions.java index 860aff0..883a209 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompVersions.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompVersions.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; /** * Stomp Spec Versions 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/VersionedStompFrameHandler.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/VersionedStompFrameHandler.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/VersionedStompFrameHandler.java index fc90244..93a7c06 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/VersionedStompFrameHandler.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/VersionedStompFrameHandler.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.stomp; +package org.apache.activemq.core.protocol.stomp; import java.nio.charset.StandardCharsets; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.protocol.stomp.Stomp.Headers; -import org.apache.activemq6.core.protocol.stomp.v10.StompFrameHandlerV10; -import org.apache.activemq6.core.protocol.stomp.v11.StompFrameHandlerV11; -import org.apache.activemq6.core.protocol.stomp.v12.StompFrameHandlerV12; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.utils.DataConstants; - -import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.protocol.stomp.Stomp.Headers; +import org.apache.activemq.core.protocol.stomp.v10.StompFrameHandlerV10; +import org.apache.activemq.core.protocol.stomp.v11.StompFrameHandlerV11; +import org.apache.activemq.core.protocol.stomp.v12.StompFrameHandlerV12; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.utils.DataConstants; + +import static org.apache.activemq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * @author <a href="mailto:[email protected]";>Howard Gao</a> 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/v10/StompFrameHandlerV10.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameHandlerV10.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameHandlerV10.java index 13eed04..6b20126 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameHandlerV10.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameHandlerV10.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.stomp.v10; +package org.apache.activemq.core.protocol.stomp.v10; import java.util.Map; -import org.apache.activemq6.core.protocol.stomp.FrameEventListener; -import org.apache.activemq6.core.protocol.stomp.HornetQStompException; -import org.apache.activemq6.core.protocol.stomp.Stomp; -import org.apache.activemq6.core.protocol.stomp.StompConnection; -import org.apache.activemq6.core.protocol.stomp.StompDecoder; -import org.apache.activemq6.core.protocol.stomp.StompFrame; -import org.apache.activemq6.core.protocol.stomp.VersionedStompFrameHandler; -import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq.core.protocol.stomp.FrameEventListener; +import org.apache.activemq.core.protocol.stomp.HornetQStompException; +import org.apache.activemq.core.protocol.stomp.Stomp; +import org.apache.activemq.core.protocol.stomp.StompConnection; +import org.apache.activemq.core.protocol.stomp.StompDecoder; +import org.apache.activemq.core.protocol.stomp.StompFrame; +import org.apache.activemq.core.protocol.stomp.VersionedStompFrameHandler; +import org.apache.activemq.core.server.HornetQServerLogger; -import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import static org.apache.activemq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * 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/v10/StompFrameV10.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameV10.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameV10.java index c62750b..bdc8952 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameV10.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v10/StompFrameV10.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.stomp.v10; +package org.apache.activemq.core.protocol.stomp.v10; -import org.apache.activemq6.core.protocol.stomp.StompFrame; +import org.apache.activemq.core.protocol.stomp.StompFrame; /** * 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/v11/StompFrameHandlerV11.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameHandlerV11.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameHandlerV11.java index a105e3c..9b6b108 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameHandlerV11.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameHandlerV11.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.stomp.v11; +package org.apache.activemq.core.protocol.stomp.v11; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.core.protocol.stomp.FrameEventListener; -import org.apache.activemq6.core.protocol.stomp.HornetQStompException; -import org.apache.activemq6.core.protocol.stomp.SimpleBytes; -import org.apache.activemq6.core.protocol.stomp.Stomp; -import org.apache.activemq6.core.protocol.stomp.StompConnection; -import org.apache.activemq6.core.protocol.stomp.StompDecoder; -import org.apache.activemq6.core.protocol.stomp.StompFrame; -import org.apache.activemq6.core.protocol.stomp.VersionedStompFrameHandler; -import org.apache.activemq6.core.server.HornetQServerLogger; - -import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +import org.apache.activemq.core.protocol.stomp.FrameEventListener; +import org.apache.activemq.core.protocol.stomp.HornetQStompException; +import org.apache.activemq.core.protocol.stomp.SimpleBytes; +import org.apache.activemq.core.protocol.stomp.Stomp; +import org.apache.activemq.core.protocol.stomp.StompConnection; +import org.apache.activemq.core.protocol.stomp.StompDecoder; +import org.apache.activemq.core.protocol.stomp.StompFrame; +import org.apache.activemq.core.protocol.stomp.VersionedStompFrameHandler; +import org.apache.activemq.core.server.HornetQServerLogger; + +import static org.apache.activemq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * @author <a href="mailto:[email protected]";>Howard Gao</a> 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/v11/StompFrameV11.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameV11.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameV11.java index 856c6a9..e7e67b2 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameV11.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v11/StompFrameV11.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.stomp.v11; +package org.apache.activemq.core.protocol.stomp.v11; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.core.protocol.stomp.Stomp; -import org.apache.activemq6.core.protocol.stomp.StompFrame; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.core.protocol.stomp.Stomp; +import org.apache.activemq.core.protocol.stomp.StompFrame; /** * @author <a href="mailto:[email protected]";>Howard Gao</a> 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/v12/StompFrameHandlerV12.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameHandlerV12.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameHandlerV12.java index 1739110..5047b3d 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameHandlerV12.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameHandlerV12.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.stomp.v12; - -import org.apache.activemq6.core.protocol.stomp.FrameEventListener; -import org.apache.activemq6.core.protocol.stomp.HornetQStompException; -import org.apache.activemq6.core.protocol.stomp.Stomp; -import org.apache.activemq6.core.protocol.stomp.StompConnection; -import org.apache.activemq6.core.protocol.stomp.StompDecoder; -import org.apache.activemq6.core.protocol.stomp.StompFrame; -import org.apache.activemq6.core.protocol.stomp.StompSubscription; -import org.apache.activemq6.core.protocol.stomp.v11.StompFrameHandlerV11; -import org.apache.activemq6.core.protocol.stomp.v11.StompFrameV11; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.ServerMessage; - -import static org.apache.activemq6.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; +package org.apache.activemq.core.protocol.stomp.v12; + +import org.apache.activemq.core.protocol.stomp.FrameEventListener; +import org.apache.activemq.core.protocol.stomp.HornetQStompException; +import org.apache.activemq.core.protocol.stomp.Stomp; +import org.apache.activemq.core.protocol.stomp.StompConnection; +import org.apache.activemq.core.protocol.stomp.StompDecoder; +import org.apache.activemq.core.protocol.stomp.StompFrame; +import org.apache.activemq.core.protocol.stomp.StompSubscription; +import org.apache.activemq.core.protocol.stomp.v11.StompFrameHandlerV11; +import org.apache.activemq.core.protocol.stomp.v11.StompFrameV11; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ServerMessage; + +import static org.apache.activemq.core.protocol.stomp.HornetQStompProtocolMessageBundle.BUNDLE; /** * @author <a href="mailto:[email protected]";>Howard Gao</a> 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/v12/StompFrameV12.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameV12.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameV12.java index 36fcbca..2f96e05 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameV12.java +++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/v12/StompFrameV12.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.stomp.v12; +package org.apache.activemq.core.protocol.stomp.v12; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.core.protocol.stomp.Stomp; -import org.apache.activemq6.core.protocol.stomp.StompFrame; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.core.protocol.stomp.Stomp; +import org.apache.activemq.core.protocol.stomp.StompFrame; /** * @author <a href="mailto:[email protected]";>Howard Gao</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory b/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory index ebfb202..7983da8 100644 --- a/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory +++ b/activemq-protocols/activemq-stomp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory @@ -1 +1 @@ -org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory \ No newline at end of file +org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/pom.xml b/activemq-protocols/pom.xml index a03d67b..d4696df 100644 --- a/activemq-protocols/pom.xml +++ b/activemq-protocols/pom.xml @@ -3,13 +3,13 @@ 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-pom</artifactId> - <groupId>org.apache.activemq6</groupId> + <artifactId>activemq-pom</artifactId> + <groupId>org.apache.activemq</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>activemq6-protocols</artifactId> + <artifactId>activemq-protocols</artifactId> <packaging>pom</packaging> <properties> @@ -17,10 +17,10 @@ </properties> <modules> - <module>activemq6-amqp-protocol</module> - <module>activemq6-stomp-protocol</module> - <module>activemq6-openwire-protocol</module> - <module>activemq6-proton-plug</module> + <module>activemq-amqp-protocol</module> + <module>activemq-stomp-protocol</module> + <module>activemq-openwire-protocol</module> + <module>activemq-proton-plug</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml index 8be562e..871fed3 100644 --- a/activemq-ra/pom.xml +++ b/activemq-ra/pom.xml @@ -4,12 +4,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-ra</artifactId> + <artifactId>activemq-ra</artifactId> <packaging>jar</packaging> <properties> @@ -30,20 +30,20 @@ <artifactId>jboss-logging</artifactId> </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> <scope>provided</scope> </dependency> <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> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java index 149072d..f05809b 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java index 5072256..a882469 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; -import org.apache.activemq6.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.HornetQIllegalStateException; 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-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java index 69d7bc8..a7de0d0 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java index 4c479f8..662506b 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.XAQueueConnectionFactory; import javax.jms.XATopicConnectionFactory; @@ -18,7 +18,7 @@ import javax.resource.Referenceable; import javax.resource.ResourceException; import java.io.Serializable; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQConnectionFactory; /** * An aggregate interface for the JMS connection factories http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java index d53abf6..f4d7327 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.Connection; import javax.jms.JMSContext; @@ -30,9 +30,9 @@ import javax.naming.Reference; import javax.resource.ResourceException; import javax.resource.spi.ConnectionManager; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.referenceable.ConnectionFactoryObjectFactory; -import org.apache.activemq6.jms.referenceable.SerializableObjectRefAddr; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.referenceable.ConnectionFactoryObjectFactory; +import org.apache.activemq.jms.referenceable.SerializableObjectRefAddr; /** * The connection factory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java index a9996f4..ee1defe 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.resource.ResourceException; import javax.resource.spi.ConnectionManager; @@ -18,7 +18,7 @@ import javax.resource.spi.ConnectionRequestInfo; import javax.resource.spi.ManagedConnection; import javax.resource.spi.ManagedConnectionFactory; -import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq.utils.ConcurrentHashSet; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java index 0e1617e..a34db36 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.util.Enumeration; import java.util.Vector; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java index bbd0071..96eea48 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.Session; import javax.resource.spi.ConnectionRequestInfo; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java index e61c636..e67055c 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.io.Serializable; import java.security.AccessController; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java index d6747a1..9185ac3 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; -import org.apache.activemq6.jms.client.HornetQConnectionForContext; -import org.apache.activemq6.jms.client.HornetQJMSContext; -import org.apache.activemq6.jms.client.ThreadAwareContext; +import org.apache.activemq.jms.client.HornetQConnectionForContext; +import org.apache.activemq.jms.client.HornetQJMSContext; +import org.apache.activemq.jms.client.ThreadAwareContext; import javax.jms.ExceptionListener; import javax.jms.JMSContext; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java index 8d354b2..bb67f34 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.JMSException; import javax.resource.ResourceException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALogger.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALogger.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALogger.java index c2ea115..d582e50 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALogger.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALogger.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; -import org.apache.activemq6.ra.inflow.HornetQActivationSpec; +import org.apache.activemq.ra.inflow.HornetQActivationSpec; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMCFProperties.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMCFProperties.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMCFProperties.java index 72198e9..a161027 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMCFProperties.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMCFProperties.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnection.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnection.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnection.java index 1fc25e0..d61c2b5 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnection.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnection.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.ExceptionListener; import javax.jms.JMSException; @@ -42,10 +42,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.jms.client.HornetQConnection; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQXAConnection; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.jms.client.HornetQConnection; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQXAConnection; /** * The managed connection http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnectionFactory.java index 10fd4ab..788d867 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnectionFactory.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAManagedConnectionFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.ConnectionMetaData; import javax.resource.ResourceException; @@ -25,8 +25,8 @@ import java.io.PrintWriter; import java.util.Iterator; import java.util.Set; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.server.recovery.XARecoveryConfig; /** * HornetQ ManagedConnectionFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMapMessage.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMapMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMapMessage.java index 660cdeb..30abb59 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMapMessage.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMapMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.util.Arrays; import java.util.Enumeration; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java index 8a8f89c..952588d 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.Destination; import javax.jms.JMSException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java index ffdccdc..81e8ad6 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageConsumer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.BytesMessage; import javax.jms.JMSException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java index fe2127a..79f4604 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.Message; import javax.jms.MessageListener; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java index 7490f6b..a168c3e 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMessageProducer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.CompletionListener; import javax.jms.Destination; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java index 9fc55c4..78d510a 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAMetaData.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.resource.ResourceException; import javax.resource.spi.ManagedConnectionMetaData; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java index 4bb8a37..d64eff8 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAObjectMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java index b935c05..1371069 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAProperties.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.io.Serializable; import java.util.Hashtable; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.utils.DefaultSensitiveStringCodec; -import org.apache.activemq6.utils.PasswordMaskingUtil; -import org.apache.activemq6.utils.SensitiveDataCodec; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.utils.DefaultSensitiveStringCodec; +import org.apache.activemq.utils.PasswordMaskingUtil; +import org.apache.activemq.utils.SensitiveDataCodec; /** @@ -59,7 +59,7 @@ public class HornetQRAProperties extends ConnectionFactoryProperties implements * Class used to locate the Transaction Manager. * Using JBoss5 as the default locator */ - private String transactionManagerLocatorClass = "org.apache.activemq6.integration.jboss.tm.JBoss5TransactionManagerLocator;org.apache.activemq6.integration.jboss.tm.JBoss4TransactionManagerLocator"; + private String transactionManagerLocatorClass = "org.apache.activemq.integration.jboss.tm.JBoss5TransactionManagerLocator;org.apache.activemq.integration.jboss.tm.JBoss4TransactionManagerLocator"; /** * Method used to locate the TM http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java index 15534ac..de4a76d 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueReceiver.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.JMSException; import javax.jms.Queue; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java index e916111..e18cfcf 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAQueueSender.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.JMSException; import javax.jms.Message; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java index aef91c2..f82ada9 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAService.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASession.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASession.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASession.java index f4b7725..b7a551b 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASession.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASession.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.BytesMessage; import javax.jms.Destination; @@ -49,8 +49,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.jms.client.HornetQSession; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.jms.client.HornetQSession; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactory.java index 09aea66..bcb631b 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactory.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.JMSException; import javax.jms.TemporaryQueue; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactoryImpl.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactoryImpl.java index 6a19f49..37e0016 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactoryImpl.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRASessionFactoryImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.ConnectionConsumer; import javax.jms.ConnectionMetaData; @@ -41,9 +41,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -import org.apache.activemq6.jms.client.HornetQConnectionForContext; -import org.apache.activemq6.jms.client.HornetQConnectionForContextImpl; +import org.apache.activemq.api.jms.HornetQJMSConstants; +import org.apache.activemq.jms.client.HornetQConnectionForContext; +import org.apache.activemq.jms.client.HornetQConnectionForContextImpl; /** * Implements the JMS Connection API and produces {@link HornetQRASession} objects. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAStreamMessage.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAStreamMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAStreamMessage.java index 5b376d2..96ac8d9 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAStreamMessage.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAStreamMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATextMessage.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATextMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATextMessage.java index 9ee7fd9..2d83d6e 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATextMessage.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATextMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.JMSException; import javax.jms.TextMessage; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicPublisher.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicPublisher.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicPublisher.java index 7141be7..e732841 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicPublisher.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicPublisher.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.JMSException; import javax.jms.Message; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicSubscriber.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicSubscriber.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicSubscriber.java index b557141..5383df7 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicSubscriber.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRATopicSubscriber.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.JMSException; import javax.jms.Topic; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAJMSContext.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAJMSContext.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAJMSContext.java index 719dba0..bbdd116 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAJMSContext.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAJMSContext.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; -import org.apache.activemq6.jms.client.HornetQConnectionForContext; -import org.apache.activemq6.jms.client.ThreadAwareContext; +import org.apache.activemq.jms.client.HornetQConnectionForContext; +import org.apache.activemq.jms.client.ThreadAwareContext; import javax.jms.XAJMSContext; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAResource.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAResource.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAResource.java index af2676a..fb9e51c 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAResource.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAXAResource.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.client.impl.HornetQXAResource; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.client.impl.HornetQXAResource; /** * HornetQXAResource. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRaUtils.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRaUtils.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRaUtils.java index 30a43cd..e29906a 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRaUtils.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRaUtils.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.naming.Context; import javax.transaction.TransactionManager; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQResourceAdapter.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQResourceAdapter.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQResourceAdapter.java index 00fafd3..23a3b03 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQResourceAdapter.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQResourceAdapter.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.jms.Session; import javax.resource.ResourceException; @@ -34,22 +34,22 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.activemq6.api.core.BroadcastEndpointFactoryConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.JGroupsBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.ra.inflow.HornetQActivation; -import org.apache.activemq6.ra.inflow.HornetQActivationSpec; -import org.apache.activemq6.ra.recovery.RecoveryManager; -import org.apache.activemq6.utils.SensitiveDataCodec; +import org.apache.activemq.api.core.BroadcastEndpointFactoryConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.JGroupsBroadcastGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.ra.inflow.HornetQActivation; +import org.apache.activemq.ra.inflow.HornetQActivationSpec; +import org.apache.activemq.ra.recovery.RecoveryManager; +import org.apache.activemq.utils.SensitiveDataCodec; import org.jgroups.JChannel; /** @@ -1808,7 +1808,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @param transactionManagerLocatorClass - * @see org.apache.activemq6.ra.HornetQRAProperties#setTransactionManagerLocatorClass(java.lang.String) + * @see org.apache.activemq.ra.HornetQRAProperties#setTransactionManagerLocatorClass(java.lang.String) */ public void setTransactionManagerLocatorClass(String transactionManagerLocatorClass) { @@ -1817,7 +1817,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.apache.activemq6.ra.HornetQRAProperties#getTransactionManagerLocatorClass() + * @see org.apache.activemq.ra.HornetQRAProperties#getTransactionManagerLocatorClass() */ public String getTransactionManagerLocatorClass() { @@ -1826,7 +1826,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.apache.activemq6.ra.HornetQRAProperties#getJgroupsChannelLocatorClass() + * @see org.apache.activemq.ra.HornetQRAProperties#getJgroupsChannelLocatorClass() */ public String getJgroupsChannelLocatorClass() { @@ -1835,7 +1835,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.apache.activemq6.ra.HornetQRAProperties#setJgroupsChannelLocatorClass() + * @see org.apache.activemq.ra.HornetQRAProperties#setJgroupsChannelLocatorClass() */ public void setJgroupsChannelLocatorClass(String jgroupsChannelLocatorClass) { @@ -1844,7 +1844,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.apache.activemq6.ra.HornetQRAProperties#getJgroupsChannelRefName() + * @see org.apache.activemq.ra.HornetQRAProperties#getJgroupsChannelRefName() */ public String getJgroupsChannelRefName() { @@ -1853,7 +1853,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.apache.activemq6.ra.HornetQRAProperties#setJgroupsChannelRefName() + * @see org.apache.activemq.ra.HornetQRAProperties#setJgroupsChannelRefName() */ public void setJgroupsChannelRefName(String jgroupsChannelRefName) { @@ -1862,7 +1862,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @return - * @see org.apache.activemq6.ra.HornetQRAProperties#getTransactionManagerLocatorMethod() + * @see org.apache.activemq.ra.HornetQRAProperties#getTransactionManagerLocatorMethod() */ public String getTransactionManagerLocatorMethod() { @@ -1871,7 +1871,7 @@ public class HornetQResourceAdapter implements ResourceAdapter, Serializable /** * @param transactionManagerLocatorMethod - * @see org.apache.activemq6.ra.HornetQRAProperties#setTransactionManagerLocatorMethod(java.lang.String) + * @see org.apache.activemq.ra.HornetQRAProperties#setTransactionManagerLocatorMethod(java.lang.String) */ public void setTransactionManagerLocatorMethod(String transactionManagerLocatorMethod) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQXAResourceWrapper.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQXAResourceWrapper.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQXAResourceWrapper.java index c632635..4861a94 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQXAResourceWrapper.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQXAResourceWrapper.java @@ -11,14 +11,14 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.ra; +package org.apache.activemq.ra; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq6.core.client.impl.HornetQXAResource; -import org.apache.activemq6.utils.VersionLoader; +import org.apache.activemq.core.client.impl.HornetQXAResource; +import org.apache.activemq.utils.VersionLoader; /** * @author <a href="mailto:[email protected]";>Martyn Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java index e687b2f..5cf31eb 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra.inflow; +package org.apache.activemq.ra.inflow; import javax.jms.Destination; import javax.jms.Message; @@ -29,25 +29,25 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQNonExistentQueueException; -import org.apache.activemq6.api.core.HornetQNotConnectedException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; -import org.apache.activemq6.ra.HornetQRABundle; -import org.apache.activemq6.ra.HornetQRAConnectionFactory; -import org.apache.activemq6.ra.HornetQRALogger; -import org.apache.activemq6.ra.HornetQRaUtils; -import org.apache.activemq6.ra.HornetQResourceAdapter; -import org.apache.activemq6.utils.FutureLatch; -import org.apache.activemq6.utils.SensitiveDataCodec; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq.ra.HornetQRABundle; +import org.apache.activemq.ra.HornetQRAConnectionFactory; +import org.apache.activemq.ra.HornetQRALogger; +import org.apache.activemq.ra.HornetQRaUtils; +import org.apache.activemq.ra.HornetQResourceAdapter; +import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.utils.SensitiveDataCodec; /** * The activation. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivationSpec.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivationSpec.java b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivationSpec.java index 99de0a8..9a87d34 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivationSpec.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivationSpec.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra.inflow; +package org.apache.activemq.ra.inflow; import javax.jms.Queue; import javax.jms.Session; @@ -27,10 +27,10 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; -import org.apache.activemq6.ra.ConnectionFactoryProperties; -import org.apache.activemq6.ra.HornetQRALogger; -import org.apache.activemq6.ra.HornetQRaUtils; -import org.apache.activemq6.ra.HornetQResourceAdapter; +import org.apache.activemq.ra.ConnectionFactoryProperties; +import org.apache.activemq.ra.HornetQRALogger; +import org.apache.activemq.ra.HornetQRaUtils; +import org.apache.activemq.ra.HornetQResourceAdapter; /** * The activation spec http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java index 2dd20b6..dc8efa0 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.ra.inflow; +package org.apache.activemq.ra.inflow; import javax.jms.MessageListener; import javax.resource.ResourceException; @@ -21,21 +21,21 @@ import javax.transaction.TransactionManager; import javax.transaction.xa.XAResource; import java.util.UUID; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientSession.QueueQuery; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.MessageHandler; -import org.apache.activemq6.core.client.impl.ClientConsumerInternal; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.ra.HornetQRALogger; -import org.apache.activemq6.ra.HornetQResourceAdapter; -import org.apache.activemq6.ra.HornetQXAResourceWrapper; -import org.apache.activemq6.utils.FutureLatch; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientSession.QueueQuery; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.MessageHandler; +import org.apache.activemq.core.client.impl.ClientConsumerInternal; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQMessage; +import org.apache.activemq.ra.HornetQRALogger; +import org.apache.activemq.ra.HornetQResourceAdapter; +import org.apache.activemq.ra.HornetQXAResourceWrapper; +import org.apache.activemq.utils.FutureLatch; /** * The message handler http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java b/activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java index 82b4f13..cba59e2 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/recovery/RecoveryManager.java @@ -11,18 +11,18 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.ra.recovery; +package org.apache.activemq.ra.recovery; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Set; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.server.recovery.HornetQRegistryBase; -import org.apache.activemq6.jms.server.recovery.XARecoveryConfig; -import org.apache.activemq6.ra.HornetQRALogger; -import org.apache.activemq6.utils.ClassloadingUtil; -import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.server.recovery.HornetQRegistryBase; +import org.apache.activemq.jms.server.recovery.XARecoveryConfig; +import org.apache.activemq.ra.HornetQRALogger; +import org.apache.activemq.utils.ClassloadingUtil; +import org.apache.activemq.utils.ConcurrentHashSet; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a>
