http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java index ef3948b..cdded90 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.settings.impl; +package org.apache.activemq.core.settings.impl; /** * A SlowConsumerPolicy
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java index 4f45a69..911d925 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.transaction; +package org.apache.activemq.core.transaction; import java.util.List; import java.util.Map; import javax.transaction.xa.Xid; -import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQComponent; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java index c2fe838..9fd5379 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.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.transaction; +package org.apache.activemq.core.transaction; import java.util.List; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.impl.RefsOperation; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.impl.RefsOperation; /** * A HornetQ internal transaction http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java index 019f99d..9a7c153 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.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.transaction; +package org.apache.activemq.core.transaction; import java.text.DateFormat; import java.util.Date; @@ -19,11 +19,11 @@ import java.util.Map; import javax.transaction.xa.Xid; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.transaction.impl.XidImpl; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.transaction.impl.XidImpl; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * A TransactionDetail @@ -86,11 +86,11 @@ public abstract class TransactionDetail { String opClassName = op.getClass().getName(); String opType = null; - if (opClassName.equals("org.apache.activemq6.core.postoffice.impl.PostOfficeImpl$AddOperation")) + if (opClassName.equals("org.apache.activemq.core.postoffice.impl.PostOfficeImpl$AddOperation")) { opType = "(+) send"; } - else if (opClassName.equals("org.apache.activemq6.core.server.impl.QueueImpl$RefsOperation")) + else if (opClassName.equals("org.apache.activemq.core.server.impl.QueueImpl$RefsOperation")) { opType = "(-) receive"; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.java index ba2fd6e..8c6890e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionFactory.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.transaction; +package org.apache.activemq.core.transaction; -import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq.core.persistence.StorageManager; import javax.transaction.xa.Xid; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java index a5b83d2..7d45fa5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.transaction; +package org.apache.activemq.core.transaction; import java.util.List; -import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq.core.server.MessageReference; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java index 7b6e4a7..96c2100 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.transaction; +package org.apache.activemq.core.transaction; import java.util.Collections; import java.util.List; -import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq.core.server.MessageReference; /** * Just a helper, when you don't want to implement all the methods on a transaction operation. @@ -74,7 +74,7 @@ public abstract class TransactionOperationAbstract implements TransactionOperati } /* (non-Javadoc) - * @see org.apache.activemq6.core.transaction.TransactionOperation#getListOnConsumer(long) + * @see org.apache.activemq.core.transaction.TransactionOperation#getListOnConsumer(long) */ @Override public List<MessageReference> getListOnConsumer(long consumerID) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java index 32a6bfc..719c471 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.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.transaction; +package org.apache.activemq.core.transaction; /** * A TransactionPropertyIndexes http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java index b1e632a..d5914e1 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.transaction.impl; +package org.apache.activemq.core.transaction.impl; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.impl.RefsOperation; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.impl.RefsOperation; /** * A BindingsTransactionImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java index 749bd35..e2f55ec 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.transaction.impl; +package org.apache.activemq.core.transaction.impl; import java.util.Map; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionDetail; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionDetail; /** * A CoreTransactionDetail http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java index f3894cf..733df43 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.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.transaction.impl; +package org.apache.activemq.core.transaction.impl; import java.util.ArrayList; import java.util.HashMap; @@ -27,9 +27,9 @@ import java.util.concurrent.TimeUnit; import javax.transaction.xa.Xid; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.core.transaction.Transaction; /** * A ResourceManagerImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java index 92eb11c..4e9fcb6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java @@ -23,7 +23,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.transaction.impl; +package org.apache.activemq.core.transaction.impl; import javax.transaction.xa.Xid; @@ -31,14 +31,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.impl.RefsOperation; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperation; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.impl.RefsOperation; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperation; /** * A TransactionImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java index a17274d..610c94b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.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.naming; +package org.apache.activemq.spi.core.naming; /** * Abstract interface for a registry to store endpoints like connection factories into. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java index 9d3d5aa..f8ca0a2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java @@ -11,9 +11,9 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.spi.core.protocol; +package org.apache.activemq.spi.core.protocol; -import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq.core.server.ServerMessage; /** * @author Clebert Suconic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java index e3489d4..5c3d1bc 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.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.protocol; +package org.apache.activemq.spi.core.protocol; import io.netty.channel.ChannelPipeline; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq6.spi.core.remoting.Acceptor; -import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.spi.core.remoting.Connection; /** * A ProtocolManager http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java index 4031aa4..ef90f2a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java @@ -10,12 +10,12 @@ * 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.Interceptor; -import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.core.server.HornetQServer; /** * A ProtocolManagerFactory http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java index 1c9c5aa..2c77307 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java @@ -10,12 +10,12 @@ * 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 org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.ServerConsumer; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.spi.core.remoting.ReadyListener; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.ServerConsumer; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.spi.core.remoting.ReadyListener; /** * A SessionCallback http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java index c84d2e2..d401d3f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java @@ -10,14 +10,14 @@ * 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 org.apache.activemq6.core.security.HornetQPrincipal; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq.core.security.HornetQPrincipal; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.management.NotificationService; /** * An Acceptor is used by the RemotingService to allow clients to connect. It should take care of http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java index a577ae0..ccacc37 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java @@ -10,20 +10,20 @@ * 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.core.server.cluster.ClusterConnection; -import org.apache.activemq6.spi.core.protocol.ProtocolManager; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.spi.core.protocol.ProtocolManager; /** * A factory for creating acceptors. * <p/> - * An Acceptor is an endpoint that a {@link org.apache.activemq6.spi.core.remoting.Connector} will connect to and is used by the remoting service. + * An Acceptor is an endpoint that a {@link org.apache.activemq.spi.core.remoting.Connector} will connect to and is used by the remoting service. * * @author <a href="[email protected]">Andy Taylor</a> * @author <a href="[email protected]">Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java index 62ae1b0..7617304 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.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 <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManager.java index dd12540..f607abf 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManager.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.security; +package org.apache.activemq.spi.core.security; import java.util.Set; -import org.apache.activemq6.core.security.CheckType; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.HornetQComponent; /** * Use to validate whether a user has is valid to connect to the server and perform certain http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManagerImpl.java index 380e694..10b7f6c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManagerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/HornetQSecurityManagerImpl.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.security; +package org.apache.activemq.spi.core.security; import java.util.ArrayList; import java.util.HashMap; @@ -18,9 +18,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq6.core.security.CheckType; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.HornetQMessageBundle; +import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.HornetQMessageBundle; /** * A basic implementation of the HornetQSecurityManager. This can be used within an appserver and be deployed by http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java index 3ce15ac..2c17b38 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.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.security; +package org.apache.activemq.spi.core.security; import java.security.Principal; import java.security.acl.Group; @@ -24,10 +24,10 @@ import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.activemq6.core.security.CheckType; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQServerLogger; /** * This implementation delegates to the JAAS security interfaces. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java index e58bd7c..afbebaf 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/package-info.java @@ -17,5 +17,5 @@ * that secuity providers can implement to plug their * implementation into HornetQ. */ -package org.apache.activemq6.spi.core.security; +package org.apache.activemq.spi.core.security; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java b/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java index 75a6f34..f524ae7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java +++ b/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.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.config.impl.Validators; +import org.apache.activemq.core.config.impl.Validators; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -116,7 +116,7 @@ public class XMLConfigurationUtil NodeList nl = e.getElementsByTagName(name); if (nl.getLength() > 0) { - return org.apache.activemq6.utils.XMLUtil.parseBoolean(nl.item(0)); + return org.apache.activemq.utils.XMLUtil.parseBoolean(nl.item(0)); } else { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security b/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security index 25fd11b..fd7afc1 100644 --- a/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security +++ b/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security @@ -10,4 +10,4 @@ ## implied. See the License for the specific language governing ## permissions and limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl \ No newline at end of file +class=org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/resources/schema/hornetq-configuration.xsd ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/resources/schema/hornetq-configuration.xsd b/activemq-server/src/main/resources/schema/hornetq-configuration.xsd index 4107340..73e911f 100644 --- a/activemq-server/src/main/resources/schema/hornetq-configuration.xsd +++ b/activemq-server/src/main/resources/schema/hornetq-configuration.xsd @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsd:schema xmlns="urn:hornetq" xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:hq="urn:org.apache.activemq6" +<xsd:schema xmlns="urn:hornetq" xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:hq="urn:org.apache.activemq" xmlns:csd="http://www.w3.org/2001/XMLSchema"; attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:hornetq" version="1.0"> @@ -189,7 +189,7 @@ </xsd:element> <xsd:element name="password-codec" type="xsd:string" - default="org.apache.activemq6.utils.DefaultSensitiveStringCodec" maxOccurs="1" minOccurs="0"> + default="org.apache.activemq.utils.DefaultSensitiveStringCodec" maxOccurs="1" minOccurs="0"> <xsd:annotation hq:linkend="configuration.masked-password"> <xsd:documentation> Class name and its parameters for the Decoder used to decode the masked password. Ignored if @@ -225,7 +225,7 @@ </xsd:annotation> </xsd:element> - <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq6" maxOccurs="1" minOccurs="0"> + <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq" maxOccurs="1" minOccurs="0"> <xsd:annotation hq:linkend="management.jmx.configuration" hq:field_name="DEFAULT_JMX_DOMAIN"> <xsd:documentation> the JMX domain used to registered HornetQ MBeans in the MBeanServer http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java index 7a904e3..8cffc7a 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java @@ -10,8 +10,8 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.impl; -import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; +package org.apache.activemq.core.config.impl; +import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; import org.junit.Before; import org.junit.Test; @@ -23,13 +23,13 @@ import java.io.ObjectOutputStream; import org.junit.Assert; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.journal.impl.JournalConstants; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.journal.impl.JournalConstants; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.UnitTestCase; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java index 43afcec..ed6e70c 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.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.config.impl; +package org.apache.activemq.core.config.impl; -import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; import org.junit.Test; import java.util.Collections; import org.junit.Assert; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.journal.impl.JournalConstants; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.journal.impl.JournalConstants; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java index edccd36..1d567dd 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.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.config.impl; +package org.apache.activemq.core.config.impl; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.deployers.impl.FileConfigurationParser; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.DefaultSensitiveStringCodec; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.deployers.impl.FileConfigurationParser; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.DefaultSensitiveStringCodec; import org.junit.Test; /** @@ -116,7 +116,7 @@ public class FileConfigurationParserTest extends UnitTestCase clusterPasswordPart = "<cluster-password>" + mask + "</cluster-password>"; - String codecPart = "<password-codec>" + "org.apache.activemq6.utils.DefaultSensitiveStringCodec" + + String codecPart = "<password-codec>" + "org.apache.activemq.utils.DefaultSensitiveStringCodec" + ";key=newkey</password-codec>"; configStr = firstPart + clusterPasswordPart + maskPasswordPart + codecPart + lastPart; @@ -133,7 +133,7 @@ public class FileConfigurationParserTest extends UnitTestCase "<name>HornetQ.main.config</name>" + "\n" + "<backup-group-name>abackupgroupname</backup-group-name>" + "\n" + "<scale-down-group-name>ascaledowngroupname</scale-down-group-name>" + "\n" + - "<log-delegate-factory-class-name>org.apache.activemq6.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>" + "\n" + + "<log-delegate-factory-class-name>org.apache.activemq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>" + "\n" + "<bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory>" + "\n" + "<journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory>" + "\n" + "<journal-min-files>10</journal-min-files>" + "\n" + @@ -141,36 +141,36 @@ public class FileConfigurationParserTest extends UnitTestCase "<paging-directory>${jboss.server.data.dir}/hornetq/paging</paging-directory>" + "\n" + "<connectors>" + "\n" + "<connector name=\"netty\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" + "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" + "<param key=\"port\" value=\"${hornetq.remoting.netty.port:5445}\"/>" + "\n" + "</connector>" + "\n" + "<connector name=\"netty-throughput\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" + "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" + "<param key=\"port\" value=\"${hornetq.remoting.netty.batch.port:5455}\"/>" + "\n" + "<param key=\"batch-delay\" value=\"50\"/>" + "\n" + "</connector>" + "\n" + "<connector name=\"in-vm\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>" + "\n" + "<param key=\"server-id\" value=\"${hornetq.server-id:0}\"/>" + "\n" + "</connector>" + "\n" + "</connectors>" + "\n" + "<acceptors>" + "\n" + "<acceptor name=\"netty\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" + "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" + "<param key=\"port\" value=\"${hornetq.remoting.netty.port:5445}\"/>" + "\n" + "</acceptor>" + "\n" + "<acceptor name=\"netty-throughput\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" + "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" + "<param key=\"port\" value=\"${hornetq.remoting.netty.batch.port:5455}\"/>" + "\n" + "<param key=\"batch-delay\" value=\"50\"/>" + "\n" + "<param key=\"direct-deliver\" value=\"false\"/>" + "\n" + "</acceptor>" + "\n" + "<acceptor name=\"in-vm\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>" + "\n" + "<param key=\"server-id\" value=\"0\"/>" + "\n" + "</acceptor>" + "\n" + "</acceptors>" + "\n" + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java index 54c6d86..7bb6c50 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.impl; +package org.apache.activemq.core.config.impl; import java.util.Collections; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.core.config.HAPolicyConfiguration; -import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; import org.junit.Assert; import org.junit.Test; @@ -93,16 +93,16 @@ public class FileConfigurationTest extends ConfigurationImplTest Assert.assertEquals(2, conf.getIncomingInterceptorClassNames().size()); Assert.assertTrue(conf.getIncomingInterceptorClassNames() - .contains("org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1")); + .contains("org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1")); Assert.assertTrue(conf.getIncomingInterceptorClassNames() - .contains("org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2")); + .contains("org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2")); Assert.assertEquals(2, conf.getConnectorConfigurations().size()); TransportConfiguration tc = conf.getConnectorConfigurations().get("connector1"); Assert.assertNotNull(tc); - Assert.assertEquals("org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1", tc.getFactoryClassName()); + Assert.assertEquals("org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1", tc.getFactoryClassName()); Assert.assertEquals("v1", tc.getParams().get("a1")); Assert.assertEquals("123", tc.getParams().get("a2")); Assert.assertEquals("345", tc.getParams().get("a3")); @@ -110,23 +110,23 @@ public class FileConfigurationTest extends ConfigurationImplTest tc = conf.getConnectorConfigurations().get("connector2"); Assert.assertNotNull(tc); - Assert.assertEquals("org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2", tc.getFactoryClassName()); + Assert.assertEquals("org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2", tc.getFactoryClassName()); Assert.assertEquals("w1", tc.getParams().get("b1")); Assert.assertEquals("234", tc.getParams().get("b2")); Assert.assertEquals(2, conf.getAcceptorConfigurations().size()); for (TransportConfiguration ac : conf.getAcceptorConfigurations()) { - if (ac.getFactoryClassName().equals("org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1")) + if (ac.getFactoryClassName().equals("org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1")) { - Assert.assertEquals("org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1", + Assert.assertEquals("org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1", ac.getFactoryClassName()); Assert.assertEquals("y1", ac.getParams().get("d1")); Assert.assertEquals("456", ac.getParams().get("d2")); } else { - Assert.assertEquals("org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2", + Assert.assertEquals("org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2", ac.getFactoryClassName()); Assert.assertEquals("z1", ac.getParams().get("e1")); Assert.assertEquals("567", ac.getParams().get("e2")); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java index a66cbf8..137b1f2 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.impl; +package org.apache.activemq.core.config.impl; -import org.apache.activemq6.core.server.cluster.ha.ColocatedPolicy; -import org.apache.activemq6.core.server.cluster.ha.HAPolicy; -import org.apache.activemq6.core.server.cluster.ha.LiveOnlyPolicy; -import org.apache.activemq6.core.server.cluster.ha.ReplicaPolicy; -import org.apache.activemq6.core.server.cluster.ha.ReplicatedPolicy; -import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq6.core.server.cluster.ha.SharedStoreMasterPolicy; -import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.apache.activemq6.core.server.impl.ColocatedActivation; -import org.apache.activemq6.core.server.impl.LiveOnlyActivation; -import org.apache.activemq6.core.server.impl.SharedNothingBackupActivation; -import org.apache.activemq6.core.server.impl.SharedNothingLiveActivation; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.impl.Activation; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.SharedStoreBackupActivation; -import org.apache.activemq6.core.server.impl.SharedStoreLiveActivation; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.core.server.cluster.ha.ColocatedPolicy; +import org.apache.activemq.core.server.cluster.ha.HAPolicy; +import org.apache.activemq.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq.core.server.impl.ColocatedActivation; +import org.apache.activemq.core.server.impl.LiveOnlyActivation; +import org.apache.activemq.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq.core.server.impl.SharedNothingLiveActivation; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.impl.Activation; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.SharedStoreBackupActivation; +import org.apache.activemq.core.server.impl.SharedStoreLiveActivation; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.Test; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java index e42ac3b..b9712a3 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.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.config.impl; +package org.apache.activemq.core.config.impl; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.tests.util.RandomUtil; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java index 32ffb1c..bce79e4 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.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.config.impl; +package org.apache.activemq.core.config.impl; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -import org.apache.activemq6.core.deployers.impl.FileConfigurationParser; -import org.apache.activemq6.tests.logging.AssertionLoggerHandler; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.core.deployers.impl.FileConfigurationParser; +import org.apache.activemq.tests.logging.AssertionLoggerHandler; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -65,7 +65,7 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase "xsi:schemaLocation=\"urn:hornetq /schema/hornetq-configuration.xsd\">\n" + "<name>HornetQ.main.config</name>" + "\n" + "<backup-group-name>anodegroupname</backup-group-name>" + "\n" + - "<log-delegate-factory-class-name>org.apache.activemq6.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>" + "\n" + + "<log-delegate-factory-class-name>org.apache.activemq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>" + "\n" + "<bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory>" + "\n" + "<journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory>" + "\n" + "<journal-min-files>10</journal-min-files>" + "\n" + @@ -73,36 +73,36 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase "<paging-directory>${jboss.server.data.dir}/hornetq/paging</paging-directory>" + "\n" + "<connectors>" + "\n" + "<connector name=\"netty\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" + "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" + "<param key=\"port\" value=\"${hornetq.remoting.netty.port:5445}\"/>" + "\n" + "</connector>" + "\n" + "<connector name=\"netty-throughput\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" + "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" + "<param key=\"port\" value=\"${hornetq.remoting.netty.batch.port:5455}\"/>" + "\n" + "<param key=\"batch-delay\" value=\"50\"/>" + "\n" + "</connector>" + "\n" + "<connector name=\"in-vm\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>" + "\n" + "<param key=\"server-id\" value=\"${hornetq.server-id:0}\"/>" + "\n" + "</connector>" + "\n" + "</connectors>" + "\n" + "<acceptors>" + "\n" + "<acceptor name=\"netty\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" + "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" + "<param key=\"port\" value=\"${hornetq.remoting.netty.port:5445}\"/>" + "\n" + "</acceptor>" + "\n" + "<acceptor name=\"netty-throughput\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" + "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" + "<param key=\"port\" value=\"${hornetq.remoting.netty.batch.port:5455}\"/>" + "\n" + "<param key=\"batch-delay\" value=\"50\"/>" + "\n" + "<param key=\"direct-deliver\" value=\"false\"/>" + "\n" + "</acceptor>" + "\n" + "<acceptor name=\"in-vm\">" + "\n" + - "<factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>" + "\n" + + "<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>" + "\n" + "<param key=\"server-id\" value=\"0\"/>" + "\n" + "</acceptor>" + "\n" + "</acceptors>" + "\n" + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java b/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java index c917112..9722a6c 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.filter.impl; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQInvalidFilterExpressionException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.SilentTestCase; +package org.apache.activemq.core.filter.impl; + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQInvalidFilterExpressionException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.SilentTestCase; 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-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java b/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java index 1f321f6..b12e01c 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.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.list; +package org.apache.activemq.core.list; import org.junit.Before; import org.junit.After; @@ -19,8 +19,8 @@ import org.junit.Test; import org.junit.Assert; -import org.apache.activemq6.utils.LinkedListIterator; -import org.apache.activemq6.utils.PriorityLinkedListImpl; +import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.utils.PriorityLinkedListImpl; /** * @author <a href="[email protected]>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java b/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java index e497e10..6db96f3 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.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.message.impl; +package org.apache.activemq.core.message.impl; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java b/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java index 5be4b8a..8b13c18 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.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.security; +package org.apache.activemq.core.security; import org.junit.Assert; import org.junit.Test; -import static org.apache.activemq6.core.security.CheckType.CONSUME; -import static org.apache.activemq6.core.security.CheckType.CREATE_DURABLE_QUEUE; -import static org.apache.activemq6.core.security.CheckType.CREATE_NON_DURABLE_QUEUE; -import static org.apache.activemq6.core.security.CheckType.DELETE_DURABLE_QUEUE; -import static org.apache.activemq6.core.security.CheckType.DELETE_NON_DURABLE_QUEUE; -import static org.apache.activemq6.core.security.CheckType.SEND; +import static org.apache.activemq.core.security.CheckType.CONSUME; +import static org.apache.activemq.core.security.CheckType.CREATE_DURABLE_QUEUE; +import static org.apache.activemq.core.security.CheckType.CREATE_NON_DURABLE_QUEUE; +import static org.apache.activemq.core.security.CheckType.DELETE_DURABLE_QUEUE; +import static org.apache.activemq.core.security.CheckType.DELETE_NON_DURABLE_QUEUE; +import static org.apache.activemq.core.security.CheckType.SEND; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java b/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java index 17d62bb..f4b592d 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.group.impl; +package org.apache.activemq.core.server.group.impl; import javax.management.ObjectName; @@ -20,40 +20,40 @@ import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.core.management.impl.HornetQServerControlImpl; -import org.apache.activemq6.core.messagecounter.MessageCounterManager; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.remoting.server.RemotingService; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.Divert; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.QueueFactory; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.cluster.Bridge; -import org.apache.activemq6.core.server.cluster.BroadcastGroup; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -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.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.spi.core.remoting.Acceptor; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.ConcurrentHashSet; -import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.management.impl.HornetQServerControlImpl; +import org.apache.activemq.core.messagecounter.MessageCounterManager; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.remoting.server.RemotingService; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.Divert; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.QueueFactory; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.core.server.cluster.BroadcastGroup; +import org.apache.activemq.core.server.cluster.ClusterConnection; +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.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.utils.ReusableLatch; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java index e6e46b2..a0b3541 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/EmbeddedServerTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.ConfigurationImpl; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; 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-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java index a358a76..109aede 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.server.impl; +package org.apache.activemq.core.server.impl; import java.io.InputStream; @@ -28,27 +28,27 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -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.activemq6.core.filter.Filter; -import org.apache.activemq6.core.message.BodyEncoder; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.cursor.PageSubscription; -import org.apache.activemq6.core.server.Consumer; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.RoutingContext; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.utils.LinkedListIterator; -import org.apache.activemq6.utils.ReferenceCounter; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.UUID; +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; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.message.BodyEncoder; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.cursor.PageSubscription; +import org.apache.activemq.core.server.Consumer; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.RoutingContext; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.utils.ReferenceCounter; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.UUID; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java b/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java index 7205272..c07b352 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.settings; +package org.apache.activemq.core.settings; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java b/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java index a27d281..920ee96 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.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.settings; +package org.apache.activemq.core.settings; import java.util.ArrayList; import java.util.HashSet; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq.tests.util.UnitTestCase; 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-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java index 748d515..62b04e4 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.version.impl; +package org.apache.activemq.core.version.impl; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java b/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java index f12c540..1eacf7c 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.java +++ b/activemq-server/src/test/java/org/apache/activemq/tests/logging/AssertionLoggerHandler.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.logging; +package org.apache.activemq.tests.logging; import java.util.Arrays; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedHornetQServer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedHornetQServer.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedHornetQServer.java index c1516a5..cc03a72 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedHornetQServer.java +++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/ColocatedHornetQServer.java @@ -10,20 +10,20 @@ * 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.management.MBeanServer; -import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.FileConfiguration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.impl.AIOFileLockNodeManager; -import org.apache.activemq6.core.server.impl.FileLockNodeManager; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.FileConfiguration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.impl.AIOFileLockNodeManager; +import org.apache.activemq.core.server.impl.FileLockNodeManager; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; public class ColocatedHornetQServer extends HornetQServerImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java index ad90f37..b33ea7c 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.java +++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/CountDownSessionFailureListener.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.util; +package org.apache.activemq.tests.util; import java.util.concurrent.CountDownLatch; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.SessionFailureListener; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.SessionFailureListener; public final class CountDownSessionFailureListener implements SessionFailureListener { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java index 3fc88c0..3b6f86d 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java +++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/InVMNodeManagerServer.java @@ -13,14 +13,14 @@ /** * */ -package org.apache.activemq6.tests.util; +package org.apache.activemq.tests.util; import javax.management.MBeanServer; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; public final class InVMNodeManagerServer extends HornetQServerImpl {
