You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2014/11/17 15:49:20 UTC
[45/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming
package names from activemq6 to activemq
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java
index 21bc209..cc6e7a9 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/BytesMessageUtil.java
@@ -11,9 +11,9 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.reader;
+package org.apache.activemq.reader;
-import org.apache.activemq6.api.core.Message;
+import org.apache.activemq.api.core.Message;
/**
* @author Clebert Suconic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java
index 734b413..ec7c436 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java
@@ -11,11 +11,11 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.reader;
+package org.apache.activemq.reader;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.utils.TypedProperties;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.utils.TypedProperties;
/**
* @author Clebert Suconic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java
index 1b0bba1..31727d1 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/MessageUtil.java
@@ -11,18 +11,18 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.reader;
+package org.apache.activemq.reader;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQPropertyConversionException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQPropertyConversionException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
/**
* static methods intended for import static on JMS like messages.
@@ -196,6 +196,6 @@ public class MessageUtil
{
return message.containsProperty(new SimpleString(name)) || name.equals(MessageUtil.JMSXDELIVERYCOUNT) ||
MessageUtil.JMSXGROUPID.equals(name) &&
- message.containsProperty(org.apache.activemq6.api.core.Message.HDR_GROUP_ID);
+ message.containsProperty(org.apache.activemq.api.core.Message.HDR_GROUP_ID);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java
index b92132e..3b4b022 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/StreamMessageUtil.java
@@ -11,12 +11,12 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.reader;
+package org.apache.activemq.reader;
-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.utils.DataConstants;
+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.utils.DataConstants;
/**
* @author Clebert Suconic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java
index 8821e4e..39dda8c 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/TextMessageUtil.java
@@ -11,11 +11,11 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.reader;
+package org.apache.activemq.reader;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
/**
* @author Clebert Suconic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java
index 55cf5b5..be286d8 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/package-info.java
@@ -18,4 +18,4 @@
* this is done at the server's
* @author Clebert Suconic
*/
-package org.apache.activemq6.reader;
\ No newline at end of file
+package org.apache.activemq.reader;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java
index e826e0b..5063991 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/AbstractRemotingConnection.java
@@ -11,21 +11,21 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.protocol;
+package org.apache.activemq.spi.core.protocol;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Executor;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.HornetQInterruptedException;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
-import org.apache.activemq6.core.remoting.CloseListener;
-import org.apache.activemq6.core.remoting.FailureListener;
-import org.apache.activemq6.spi.core.remoting.Connection;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.remoting.CloseListener;
+import org.apache.activemq.core.remoting.FailureListener;
+import org.apache.activemq.spi.core.remoting.Connection;
/**
* @author Clebert Suconic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java
index 2ebc470..89d5e0c 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/ConnectionEntry.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.protocol;
+package org.apache.activemq.spi.core.protocol;
import java.util.concurrent.Executor;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java
index 51a048d..578d744 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/protocol/RemotingConnection.java
@@ -10,16 +10,16 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.protocol;
+package org.apache.activemq.spi.core.protocol;
import java.util.List;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.core.remoting.CloseListener;
-import org.apache.activemq6.core.remoting.FailureListener;
-import org.apache.activemq6.spi.core.remoting.BufferHandler;
-import org.apache.activemq6.spi.core.remoting.Connection;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.core.remoting.CloseListener;
+import org.apache.activemq.core.remoting.FailureListener;
+import org.apache.activemq.spi.core.remoting.BufferHandler;
+import org.apache.activemq.spi.core.remoting.Connection;
/**
* A RemotingConnection is a connection between a client and a server.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java
index 98c477c..e4ffcf7 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/AbstractConnector.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java
index 12db924..3c46adf 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferDecoder.java
@@ -10,9 +10,9 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
-import org.apache.activemq6.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffer;
/**
* A BufferDecoder
@@ -24,7 +24,7 @@ import org.apache.activemq6.api.core.HornetQBuffer;
public interface BufferDecoder
{
/**
- * called by the remoting system prior to {@link org.apache.activemq6.spi.core.remoting.BufferHandler#bufferReceived(Object, org.apache.activemq6.api.core.HornetQBuffer)}.
+ * called by the remoting system prior to {@link org.apache.activemq.spi.core.remoting.BufferHandler#bufferReceived(Object, org.apache.activemq.api.core.HornetQBuffer)}.
* <p>
* The implementation should return true if there is enough data in the buffer to decode. otherwise false.
* * @param buffer the buffer
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java
index 3f3ae91..398a84e 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/BufferHandler.java
@@ -10,9 +10,9 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
-import org.apache.activemq6.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffer;
/**
* A BufferHandler that will handle buffers received by an acceptor.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java
index f11faf1..89227c6 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManager.java
@@ -11,16 +11,16 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
import java.util.List;
import java.util.concurrent.locks.Lock;
import io.netty.channel.ChannelPipeline;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.Interceptor;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.Interceptor;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
/**
* @author Clebert Suconic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java
index 49e81f9..14e4314 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ClientProtocolManagerFactory.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java
index 5bd747b..d9b4098 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connection.java
@@ -10,13 +10,13 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
import io.netty.channel.ChannelFutureListener;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.core.security.HornetQPrincipal;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.core.security.HornetQPrincipal;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
/**
* The connection used by a channel to write data to.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java
index 6d14138..e158fae 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectionLifeCycleListener.java
@@ -10,10 +10,10 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.core.server.HornetQComponent;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.core.server.HornetQComponent;
/**
* A ConnectionLifeCycleListener is called by the remoting implementation to notify of connection events.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java
index 349213b..1ea2aaa 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/Connector.java
@@ -11,7 +11,7 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java
index b309a75..7839b99 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConnectorFactory.java
@@ -10,19 +10,19 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
-import org.apache.activemq6.api.core.TransportConfigurationHelper;
+import org.apache.activemq.api.core.TransportConfigurationHelper;
/**
* A ConnectorFactory is used by the client for creating connectors.
* <p>
- * A Connector is used to connect to an {@link org.apache.activemq6.spi.core.remoting.Acceptor}.
+ * A Connector is used to connect to an {@link org.apache.activemq.spi.core.remoting.Acceptor}.
*
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
*/
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java
index 51e4155..2dad5ea 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ConsumerContext.java
@@ -11,7 +11,7 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
/**
* @author Clebert Suconic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java
index 7829410..6cf413b 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/ReadyListener.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
/**
* A ReadyListener
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java
index abc8657..da3c69d 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/SessionContext.java
@@ -11,28 +11,28 @@
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
import javax.transaction.xa.XAException;
import javax.transaction.xa.Xid;
import java.util.HashMap;
import java.util.concurrent.Executor;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq6.core.client.impl.ClientConsumerInternal;
-import org.apache.activemq6.core.client.impl.ClientLargeMessageInternal;
-import org.apache.activemq6.core.client.impl.ClientMessageInternal;
-import org.apache.activemq6.core.client.impl.ClientProducerCreditsImpl;
-import org.apache.activemq6.core.client.impl.ClientSessionInternal;
-import org.apache.activemq6.core.message.impl.MessageInternal;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
-import org.apache.activemq6.utils.IDGenerator;
-import org.apache.activemq6.utils.SimpleIDGenerator;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.core.client.impl.ClientConsumerInternal;
+import org.apache.activemq.core.client.impl.ClientLargeMessageInternal;
+import org.apache.activemq.core.client.impl.ClientMessageInternal;
+import org.apache.activemq.core.client.impl.ClientProducerCreditsImpl;
+import org.apache.activemq.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.core.message.impl.MessageInternal;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.utils.IDGenerator;
+import org.apache.activemq.utils.SimpleIDGenerator;
/**
* @author Clebert Suconic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java
index 05ef1be..cf6d52f 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/TopologyResponseHandler.java
@@ -10,11 +10,11 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
-import org.apache.activemq6.api.core.Pair;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.api.core.Pair;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
/**
* @author Clebert Suconic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java
index f6cebeb..d51337d 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/spi/core/remoting/package-info.java
@@ -16,5 +16,5 @@
* This package defines the Service Provide Interface that
* remoting providers must implement to be supported by HornetQ.
*/
-package org.apache.activemq6.spi.core.remoting;
+package org.apache.activemq.spi.core.remoting;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java
index fb19e41..c4b5f8a 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/BufferHelper.java
@@ -10,10 +10,10 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.SimpleString;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.SimpleString;
/**
* Helper methods to read and write from HornetQBuffer.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java
index bf619cf..f970cb0 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfigurationHelper.java
@@ -10,11 +10,11 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
import java.util.HashSet;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java
index 85d7034..90807c2 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/ConfirmationWindowWarning.java
@@ -13,7 +13,7 @@
/**
*
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.util.concurrent.atomic.AtomicBoolean;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java
index c735fa0..3120975 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/DeflaterReader.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.io.IOException;
import java.io.InputStream;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java
index b2d00f2..98bc5a2 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/ExecutorFactory.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.util.concurrent.Executor;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java
index c4fa561..539244b 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/FutureLatch.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java
index cb2edde..690febc 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/HornetQBufferInputStream.java
@@ -10,12 +10,12 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.activemq6.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffer;
/**
* Used to send large messages
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java
index 0d31ff7..5fe319c 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/IDGenerator.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
/**
* Generator of record IDs for the journals.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java
index 13eea8b..9821e34 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterReader.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.io.IOException;
import java.io.InputStream;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java
index e2a4691..f3d5eca 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/InflaterWriter.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.io.IOException;
import java.io.OutputStream;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java
index 0af4b02..5da6103 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/JNDIUtil.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.util.StringTokenizer;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java
index 3d288e8..e730b98 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedList.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
/**
* A LinkedList
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java
index 382d471..a0bbb74 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListImpl.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.lang.reflect.Array;
import java.util.NoSuchElementException;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java
index 8100a78..4f4001e 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/LinkedListIterator.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java
index b9633b6..e1e6f40 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/MemorySize.java
@@ -10,9 +10,9 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
-import org.apache.activemq6.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientLogger;
import java.lang.ref.WeakReference;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java
index 077225d..47e5f77 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/ObjectInputStreamWithClassLoader.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.io.IOException;
import java.io.InputStream;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java
index 7c8ee02..9e26a6e 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/OrderedExecutorFactory.java
@@ -10,13 +10,13 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
-import org.apache.activemq6.api.core.HornetQInterruptedException;
-import org.apache.activemq6.core.client.HornetQClientLogger;
+import org.apache.activemq.api.core.HornetQInterruptedException;
+import org.apache.activemq.core.client.HornetQClientLogger;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java
index e702c93..439fce7 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedList.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java
index ebd26f1..1cc0aa6 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/PriorityLinkedListImpl.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.lang.reflect.Array;
import java.util.NoSuchElementException;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java
index 45a0131..c707d0c 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/Random.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java
index 3d0dc3a..53f0439 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/SecurityFormatter.java
@@ -10,9 +10,9 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
-import org.apache.activemq6.core.security.Role;
+import org.apache.activemq.core.security.Role;
import java.util.ArrayList;
import java.util.HashSet;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java
index 3ab77b9..c9176a2 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/SimpleIDGenerator.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
/**
* A SimpleIDGenerator
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java
index 2214469..d0dbba8 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/SizeFormatterUtil.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
/**
* A SizeFormatterUtil
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java
index dbff41b..d0eef04 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/SoftValueHashMap.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
@@ -24,7 +24,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.activemq6.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientLogger;
/**
* A SoftValueHashMap
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java
index 7aa6cb6..b9e19ef 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/TimeAndCounterIDGenerator.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.util.concurrent.atomic.AtomicLong;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java
index d4ae6f7..3957910 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiter.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
/**
* This class can throttle to a specific rate, using an algorithm based on the <a
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiterImpl.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiterImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiterImpl.java
index ac64da1..c5c54d6 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiterImpl.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/TokenBucketLimiterImpl.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.util.concurrent.TimeUnit;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java
index e7696d2..2710d8f 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/VersionLoader.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import java.io.IOException;
import java.io.InputStream;
@@ -25,9 +25,9 @@ import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.version.Version;
-import org.apache.activemq6.core.version.impl.VersionImpl;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.version.Version;
+import org.apache.activemq.core.version.impl.VersionImpl;
/**
* This loads the version info in from a version.properties file.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/XMLUtil.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/XMLUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/XMLUtil.java
index c0f4e07..48bdec4 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/XMLUtil.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/XMLUtil.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
@@ -29,8 +29,8 @@ import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.List;
-import org.apache.activemq6.core.client.HornetQClientLogger;
-import org.apache.activemq6.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientMessageBundle;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java
index 00ec960..e186d16 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/XidCodecSupport.java
@@ -10,12 +10,12 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
import javax.transaction.xa.Xid;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.core.transaction.impl.XidImpl;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.core.transaction.impl.XidImpl;
/**
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java
index 982570f..f7556ee 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java
@@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
-package org.apache.activemq6.utils.json;
+package org.apache.activemq.utils.json;
import java.io.IOException;
import java.io.Writer;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java
index f1b47c9..2f0dd9e 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java
@@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
-package org.apache.activemq6.utils.json;
+package org.apache.activemq.utils.json;
/**
* The JSONException is thrown by the JSON.org classes then things are amiss.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java
index bf74a3e..c061104 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java
@@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
-package org.apache.activemq6.utils.json;
+package org.apache.activemq.utils.json;
import java.io.IOException;
import java.io.Writer;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java
index 7679041..34ffc9b 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java
@@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
-package org.apache.activemq6.utils.json;
+package org.apache.activemq.utils.json;
/**
* The <code>JSONString</code> interface allows a <code>toJSONString()</code>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java
index 19cc407..894f725 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java
@@ -34,7 +34,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
-package org.apache.activemq6.utils.json;
+package org.apache.activemq.utils.json;
import java.io.BufferedReader;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java
index c532481..eef54c6 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/package-info.java
@@ -15,5 +15,5 @@
* <br>
* This package defines the utilities class used by HornetQ.
*/
-package org.apache.activemq6.utils;
+package org.apache.activemq.utils;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt b/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
index 23d4b71..c31a87e 100644
--- a/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
+++ b/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
@@ -1,7 +1,7 @@
-package org.apache.activemq6.api.config;
+package org.apache.activemq.api.config;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.journal.impl.JournalConstants;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.journal.impl.JournalConstants;
/**
* Default values of HornetQ configuration parameters.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/main/resources/hqDefaults.xsl
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/resources/hqDefaults.xsl b/activemq-core-client/src/main/resources/hqDefaults.xsl
index 8c56c54..6f67fff 100644
--- a/activemq-core-client/src/main/resources/hqDefaults.xsl
+++ b/activemq-core-client/src/main/resources/hqDefaults.xsl
@@ -3,7 +3,7 @@
<xsl:stylesheet version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:hq="urn:org.apache.activemq6"
+ xmlns:hq="urn:org.apache.activemq"
xmlns:fn="http://www.w3.org/2005/xpath-functions">
<!-- This XSLT creates the class HornetQDefaultsConfiguration.java.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java b/activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java
index bee8784..327325a 100644
--- a/activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java
+++ b/activemq-core-client/src/test/java/org/apache/activemq/tests/CoreUnitTestCase.java
@@ -10,13 +10,13 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.tests;
+package org.apache.activemq.tests;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.activemq6.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.HornetQClientLogger;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.rules.TestRule;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java b/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java
index de35d40..aae7eda 100644
--- a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java
+++ b/activemq-core-client/src/test/java/org/apache/activemq/tests/util/RandomUtil.java
@@ -10,16 +10,16 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.tests.util;
+package org.apache.activemq.tests.util;
import javax.transaction.xa.Xid;
import java.util.Random;
import java.util.UUID;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQBuffers;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.transaction.impl.XidImpl;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.transaction.impl.XidImpl;
/**
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java b/activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java
index 159dcd0..7dc189f 100644
--- a/activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java
+++ b/activemq-core-client/src/test/java/org/apache/activemq/tests/util/SilentTestCase.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.tests.util;
+package org.apache.activemq.tests.util;
import org.junit.Before;
import org.junit.After;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java
index 58cebf9..607382a 100644
--- a/activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java
+++ b/activemq-core-client/src/test/java/org/apache/activemq/util/CompressionUtilTest.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.util;
+package org.apache.activemq.util;
import org.junit.Test;
@@ -23,9 +23,9 @@ import java.util.zip.Deflater;
import org.junit.Assert;
-import org.apache.activemq6.utils.DeflaterReader;
-import org.apache.activemq6.utils.InflaterReader;
-import org.apache.activemq6.utils.InflaterWriter;
+import org.apache.activemq.utils.DeflaterReader;
+import org.apache.activemq.utils.InflaterReader;
+import org.apache.activemq.utils.InflaterWriter;
/**
* A CompressionUtilTest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java
index 9c49640..a428633 100644
--- a/activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java
+++ b/activemq-core-client/src/test/java/org/apache/activemq/util/ConcurrentHashSetTest.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.util;
+package org.apache.activemq.util;
import org.junit.Before;
import org.junit.After;
@@ -21,9 +21,9 @@ import java.util.Iterator;
import org.junit.Assert;
-import org.apache.activemq6.tests.util.RandomUtil;
-import org.apache.activemq6.utils.ConcurrentHashSet;
-import org.apache.activemq6.utils.ConcurrentSet;
+import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.utils.ConcurrentHashSet;
+import org.apache.activemq.utils.ConcurrentSet;
/**
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java
index 29b17ef..a0bfc7f 100644
--- a/activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java
+++ b/activemq-core-client/src/test/java/org/apache/activemq/util/TimeAndCounterIDGeneratorTest.java
@@ -10,7 +10,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.util;
+package org.apache.activemq.util;
import org.junit.Test;
@@ -19,9 +19,9 @@ import java.util.concurrent.CountDownLatch;
import org.junit.Assert;
-import org.apache.activemq6.tests.CoreUnitTestCase;
-import org.apache.activemq6.utils.ConcurrentHashSet;
-import org.apache.activemq6.utils.TimeAndCounterIDGenerator;
+import org.apache.activemq.tests.CoreUnitTestCase;
+import org.apache.activemq.utils.ConcurrentHashSet;
+import org.apache.activemq.utils.TimeAndCounterIDGenerator;
/**
* A TimeAndCounterIDGeneratorTest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java
index defac6d..d83c158 100644
--- a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java
+++ b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesConversionTest.java
@@ -10,11 +10,11 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.util;
-import org.apache.activemq6.api.core.HornetQPropertyConversionException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.tests.util.RandomUtil;
-import org.apache.activemq6.utils.TypedProperties;
+package org.apache.activemq.util;
+import org.apache.activemq.api.core.HornetQPropertyConversionException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.utils.TypedProperties;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java
index 72a63f2..41ac49a 100644
--- a/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java
+++ b/activemq-core-client/src/test/java/org/apache/activemq/util/TypedPropertiesTest.java
@@ -10,14 +10,14 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.util;
+package org.apache.activemq.util;
import java.util.Iterator;
-import org.apache.activemq6.api.core.HornetQBuffer;
-import org.apache.activemq6.api.core.HornetQBuffers;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.tests.util.RandomUtil;
-import org.apache.activemq6.utils.TypedProperties;
+import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.tests.util.RandomUtil;
+import org.apache.activemq.utils.TypedProperties;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java b/activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java
index 6153bca..8bcd85b 100644
--- a/activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java
+++ b/activemq-core-client/src/test/java/org/apache/activemq/util/XMLUtilTest.java
@@ -10,14 +10,14 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-package org.apache.activemq6.util;
+package org.apache.activemq.util;
import org.junit.Test;
import org.junit.Assert;
-import org.apache.activemq6.tests.util.SilentTestCase;
-import org.apache.activemq6.utils.XMLUtil;
+import org.apache.activemq.tests.util.SilentTestCase;
+import org.apache.activemq.utils.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -36,9 +36,9 @@ public class XMLUtilTest extends SilentTestCase
{
String document = "<blah>foo</blah>";
- Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(document);
+ Element e = org.apache.activemq.utils.XMLUtil.stringToElement(document);
- Assert.assertEquals("foo", org.apache.activemq6.utils.XMLUtil.getTextContent(e));
+ Assert.assertEquals("foo", org.apache.activemq.utils.XMLUtil.getTextContent(e));
}
@Test
@@ -48,7 +48,7 @@ public class XMLUtilTest extends SilentTestCase
Element e = XMLUtil.stringToElement(document);
- Assert.assertEquals("foo", org.apache.activemq6.utils.XMLUtil.getTextContent(e));
+ Assert.assertEquals("foo", org.apache.activemq.utils.XMLUtil.getTextContent(e));
}
@Test
@@ -56,11 +56,11 @@ public class XMLUtilTest extends SilentTestCase
{
String document = "<blah someattribute=\"somevalue\"><a/></blah>";
- Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(document);
+ Element e = org.apache.activemq.utils.XMLUtil.stringToElement(document);
- String s = org.apache.activemq6.utils.XMLUtil.getTextContent(e);
+ String s = org.apache.activemq.utils.XMLUtil.getTextContent(e);
- Element subelement = org.apache.activemq6.utils.XMLUtil.stringToElement(s);
+ Element subelement = org.apache.activemq.utils.XMLUtil.stringToElement(s);
Assert.assertEquals("a", subelement.getNodeName());
}
@@ -70,11 +70,11 @@ public class XMLUtilTest extends SilentTestCase
{
String document = "<blah someattribute=\"somevalue\"><a></a></blah>";
- Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(document);
+ Element e = org.apache.activemq.utils.XMLUtil.stringToElement(document);
- String s = org.apache.activemq6.utils.XMLUtil.getTextContent(e);
+ String s = org.apache.activemq.utils.XMLUtil.getTextContent(e);
- Element subelement = org.apache.activemq6.utils.XMLUtil.stringToElement(s);
+ Element subelement = org.apache.activemq.utils.XMLUtil.stringToElement(s);
Assert.assertEquals("a", subelement.getNodeName());
}
@@ -84,11 +84,11 @@ public class XMLUtilTest extends SilentTestCase
{
String document = "<blah someattribute=\"somevalue\"><a><b/></a></blah>";
- Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(document);
+ Element e = org.apache.activemq.utils.XMLUtil.stringToElement(document);
- String s = org.apache.activemq6.utils.XMLUtil.getTextContent(e);
+ String s = org.apache.activemq.utils.XMLUtil.getTextContent(e);
- Element subelement = org.apache.activemq6.utils.XMLUtil.stringToElement(s);
+ Element subelement = org.apache.activemq.utils.XMLUtil.stringToElement(s);
Assert.assertEquals("a", subelement.getNodeName());
NodeList nl = subelement.getChildNodes();
@@ -112,7 +112,7 @@ public class XMLUtilTest extends SilentTestCase
String s = "<a/>";
String s2 = "<a/>";
- XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.apache.activemq6.utils.XMLUtil.stringToElement(s2));
+ XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.apache.activemq.utils.XMLUtil.stringToElement(s2));
}
@Test
@@ -121,7 +121,7 @@ public class XMLUtilTest extends SilentTestCase
String s = "<a></a>";
String s2 = "<a/>";
- XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.apache.activemq6.utils.XMLUtil.stringToElement(s2));
+ XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), org.apache.activemq.utils.XMLUtil.stringToElement(s2));
}
@Test
@@ -132,7 +132,7 @@ public class XMLUtilTest extends SilentTestCase
try
{
- org.apache.activemq6.utils.XMLUtil.assertEquivalent(org.apache.activemq6.utils.XMLUtil.stringToElement(s),
+ org.apache.activemq.utils.XMLUtil.assertEquivalent(org.apache.activemq.utils.XMLUtil.stringToElement(s),
XMLUtil.stringToElement(s2));
Assert.fail("this should throw exception");
}
@@ -148,8 +148,8 @@ public class XMLUtilTest extends SilentTestCase
String s = "<a attr1=\"val1\" attr2=\"val2\"/>";
String s2 = "<a attr2=\"val2\" attr1=\"val1\"/>";
- org.apache.activemq6.utils.XMLUtil.assertEquivalent(org.apache.activemq6.utils.XMLUtil.stringToElement(s),
- org.apache.activemq6.utils.XMLUtil.stringToElement(s2));
+ org.apache.activemq.utils.XMLUtil.assertEquivalent(org.apache.activemq.utils.XMLUtil.stringToElement(s),
+ org.apache.activemq.utils.XMLUtil.stringToElement(s2));
}
@Test
@@ -158,8 +158,8 @@ public class XMLUtilTest extends SilentTestCase
String s = "<a><b/></a>";
String s2 = "<a><b/></a>";
- org.apache.activemq6.utils.XMLUtil.assertEquivalent(org.apache.activemq6.utils.XMLUtil.stringToElement(s),
- org.apache.activemq6.utils.XMLUtil.stringToElement(s2));
+ org.apache.activemq.utils.XMLUtil.assertEquivalent(org.apache.activemq.utils.XMLUtil.stringToElement(s),
+ org.apache.activemq.utils.XMLUtil.stringToElement(s2));
}
@Test
@@ -168,8 +168,8 @@ public class XMLUtilTest extends SilentTestCase
String s = "<enclosing><a attr1=\"val1\" attr2=\"val2\"/></enclosing>";
String s2 = "<enclosing><a attr2=\"val2\" attr1=\"val1\"/></enclosing>";
- org.apache.activemq6.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
- org.apache.activemq6.utils.XMLUtil.stringToElement(s2));
+ org.apache.activemq.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
+ org.apache.activemq.utils.XMLUtil.stringToElement(s2));
}
@Test
@@ -180,8 +180,8 @@ public class XMLUtilTest extends SilentTestCase
try
{
- org.apache.activemq6.utils.XMLUtil.assertEquivalent(org.apache.activemq6.utils.XMLUtil.stringToElement(s),
- org.apache.activemq6.utils.XMLUtil.stringToElement(s2));
+ org.apache.activemq.utils.XMLUtil.assertEquivalent(org.apache.activemq.utils.XMLUtil.stringToElement(s),
+ org.apache.activemq.utils.XMLUtil.stringToElement(s2));
Assert.fail("this should throw exception");
}
catch (IllegalArgumentException e)
@@ -197,25 +197,25 @@ public class XMLUtilTest extends SilentTestCase
String s = "<a><!-- some comment --><b/><!--some other comment --><c/><!-- blah --></a>";
String s2 = "<a><b/><!--blah blah--><c/></a>";
- org.apache.activemq6.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
- org.apache.activemq6.utils.XMLUtil.stringToElement(s2));
+ org.apache.activemq.utils.XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
+ org.apache.activemq.utils.XMLUtil.stringToElement(s2));
}
@Test
public void testElementToString_1() throws Exception
{
String s = "<a b=\"something\">somethingelse</a>";
- Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(s);
- String tostring = org.apache.activemq6.utils.XMLUtil.elementToString(e);
- Element convertedAgain = org.apache.activemq6.utils.XMLUtil.stringToElement(tostring);
- org.apache.activemq6.utils.XMLUtil.assertEquivalent(e, convertedAgain);
+ Element e = org.apache.activemq.utils.XMLUtil.stringToElement(s);
+ String tostring = org.apache.activemq.utils.XMLUtil.elementToString(e);
+ Element convertedAgain = org.apache.activemq.utils.XMLUtil.stringToElement(tostring);
+ org.apache.activemq.utils.XMLUtil.assertEquivalent(e, convertedAgain);
}
@Test
public void testElementToString_2() throws Exception
{
String s = "<a b=\"something\"></a>";
- Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(s);
+ Element e = org.apache.activemq.utils.XMLUtil.stringToElement(s);
String tostring = XMLUtil.elementToString(e);
Element convertedAgain = XMLUtil.stringToElement(tostring);
XMLUtil.assertEquivalent(e, convertedAgain);
@@ -225,20 +225,20 @@ public class XMLUtilTest extends SilentTestCase
public void testElementToString_3() throws Exception
{
String s = "<a b=\"something\"/>";
- Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(s);
+ Element e = org.apache.activemq.utils.XMLUtil.stringToElement(s);
String tostring = XMLUtil.elementToString(e);
- Element convertedAgain = org.apache.activemq6.utils.XMLUtil.stringToElement(tostring);
- org.apache.activemq6.utils.XMLUtil.assertEquivalent(e, convertedAgain);
+ Element convertedAgain = org.apache.activemq.utils.XMLUtil.stringToElement(tostring);
+ org.apache.activemq.utils.XMLUtil.assertEquivalent(e, convertedAgain);
}
@Test
public void testElementToString_4() throws Exception
{
String s = "<a><![CDATA[somedata]]></a>";
- Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(s);
+ Element e = org.apache.activemq.utils.XMLUtil.stringToElement(s);
String tostring = XMLUtil.elementToString(e);
- Element convertedAgain = org.apache.activemq6.utils.XMLUtil.stringToElement(tostring);
- org.apache.activemq6.utils.XMLUtil.assertEquivalent(e, convertedAgain);
+ Element convertedAgain = org.apache.activemq.utils.XMLUtil.stringToElement(tostring);
+ org.apache.activemq.utils.XMLUtil.assertEquivalent(e, convertedAgain);
}
@Test
@@ -260,7 +260,7 @@ public class XMLUtilTest extends SilentTestCase
+ "</configuration>";
System.setProperty("sysprop1", "test1");
System.setProperty("sysprop2", "content4");
- String replaced = org.apache.activemq6.utils.XMLUtil.replaceSystemProps(before);
+ String replaced = org.apache.activemq.utils.XMLUtil.replaceSystemProps(before);
Assert.assertEquals(after, replaced);
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-dto/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-dto/pom.xml b/activemq-dto/pom.xml
index 729ba51..419f8e2 100644
--- a/activemq-dto/pom.xml
+++ b/activemq-dto/pom.xml
@@ -3,12 +3,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-dto</artifactId>
+ <artifactId>activemq-dto</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ6 DTO</name>
@@ -51,9 +51,9 @@
<configuration>
<tasks>
<taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask"/>
- <mkdir dir="${project.build.directory}/schema/org.apache.activemq6/dto"/>
- <echo message="Generating XSD to: ${project.build.directory}/schema/org.apache.activemq6/dto"/>
- <schemagen srcdir="${basedir}/.." destdir="${project.build.directory}/schema/org.apache.activemq6/dto"
+ <mkdir dir="${project.build.directory}/schema/org.apache.activemq/dto"/>
+ <echo message="Generating XSD to: ${project.build.directory}/schema/org.apache.activemq/dto"/>
+ <schemagen srcdir="${basedir}/.." destdir="${project.build.directory}/schema/org.apache.activemq/dto"
includeantruntime="false">
<schema namespace="http://hornetq.org/schema" file="hornetq.xsd"/>
<classpath refid="maven.compile.classpath"/>