From 32dbd341efeff4485b3e68b9def24e11735dc68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 9 Jul 2015 13:15:39 +0300 Subject: [PATCH] Spelling fixes --- .../artemis/api/core/ActiveMQBuffer.java | 2 +- .../artemis/api/core/ActiveMQBuffers.java | 8 +++--- .../core/ActiveMQIllegalStateException.java | 2 +- .../activemq/artemis/utils/UUIDGenerator.java | 2 +- .../config/ActiveMQDefaultConfiguration.java | 4 +-- .../activemq/artemis/api/core/Message.java | 8 +++--- .../api/core/client/ActiveMQClient.java | 2 +- .../api/core/client/ClientConsumer.java | 8 +++--- .../api/core/client/ClientSession.java | 2 +- .../api/core/client/ClientSessionFactory.java | 2 +- .../client/SendAcknowledgementHandler.java | 2 +- .../management/ActiveMQComponentControl.java | 2 +- .../management/ActiveMQServerControl.java | 2 +- .../api/core/management/ManagementHelper.java | 4 +-- .../core/client/ActiveMQClientLogger.java | 4 +-- .../client/ActiveMQClientMessageBundle.java | 2 +- .../core/client/impl/ClientConsumerImpl.java | 4 +-- .../client/impl/ClientSessionFactoryImpl.java | 2 +- .../artemis/utils/InflaterReader.java | 4 +-- .../artemis/utils/InflaterWriter.java | 2 +- .../artemis/utils/json/JSONArray.java | 4 +-- .../artemis/utils/json/JSONObject.java | 2 +- .../src/main/resources/README.html | 2 +- .../artemis/api/jms/ActiveMQJMSClient.java | 10 +++---- .../jms/management/JMSManagementHelper.java | 4 +-- .../artemis/jms/client/ActiveMQSession.java | 8 +++--- .../jms/client/SelectorTranslator.java | 2 +- .../ConnectionFactoryObjectFactory.java | 2 +- .../DestinationObjectFactory.java | 2 +- .../jms/bridge/impl/JMSBridgeImpl.java | 2 +- .../jms/server/embedded/EmbeddedJMS.java | 2 +- .../openwire/amq/AMQConnectionContext.java | 8 +++--- .../openwire/amq/AMQSubscription.java | 2 +- .../context/AbstractProtonContextSender.java | 2 +- .../core/protocol/stomp/StompDecoder.java | 2 +- .../artemis/ra/ActiveMQRAService.java | 2 +- .../rest/queue/push/ActiveMQPushStrategy.java | 2 +- .../selector/filter/ComparisonExpression.java | 6 ++--- .../src/main/javacc/HyphenatedParser.jj | 2 +- .../src/main/javacc/StrictParser.jj | 2 +- .../artemis/core/filter/impl/FilterImpl.java | 2 +- .../core/messagecounter/MessageCounter.java | 2 +- .../impl/PageSubscriptionCounterImpl.java | 6 ++--- .../paging/impl/PageTransactionInfoImpl.java | 2 +- .../artemis/core/server/ActiveMQServers.java | 2 +- .../server/cluster/qourum/QuorumManager.java | 2 +- .../server/cluster/qourum/QuorumVote.java | 2 +- .../artemis/core/server/impl/QueueImpl.java | 2 +- .../artemis/core/transaction/Transaction.java | 2 +- .../schema/artemis-configuration.xsd | 2 +- .../artemis/tests/util/ActiveMQTestBase.java | 2 +- .../xa/ActiveMQXAResourceWrapperImpl.java | 2 +- docs/user-manual/en/clusters.md | 4 +-- docs/user-manual/en/configuring-transports.md | 2 +- docs/user-manual/en/ha.md | 2 +- docs/user-manual/en/rest.md | 6 ++--- docs/user-manual/en/security.md | 2 +- docs/user-manual/en/using-jms.md | 2 +- .../core/example/EmbeddedRemoteExample.java | 2 +- .../artemis/core/example/EmbeddedExample.java | 2 +- .../jms/example/ClientKickoffExample.java | 2 +- .../client-side-failoverlistener/readme.html | 2 +- .../ClientSideFailoverListerExample.java | 2 +- .../readme.html | 2 +- .../ClusteredDurableSubscriptionExample.java | 2 +- .../artemis/jms/example/EmbeddedExample.java | 2 +- .../artemis/jms/example/EmbeddedExample.java | 2 +- examples/jms/expiry/readme.html | 4 +-- examples/jms/message-counters/readme.html | 2 +- examples/soak/normal/README | 2 +- .../activemq/JmsSessionRecoverTest.java | 4 +-- .../ProducerFlowControlSendFailTest.java | 8 +++--- .../activemq/ProducerFlowControlTest.java | 10 +++---- .../org/apache/activemq/TimeStampTest.java | 2 +- .../apache/activemq/broker/BrokerTest.java | 4 +-- .../activemq/broker/RecoveryBrokerTest.java | 4 +-- .../activemq/broker/XARecoveryBrokerTest.java | 10 +++---- .../jmx/BrokerViewSlowStoreStartupTest.java | 4 +-- .../apache/activemq/broker/jmx/MBeanTest.java | 2 +- .../broker/scheduler/JobSchedulerTest.java | 2 +- .../broker/virtual/VirtualTopicDLQTest.java | 2 +- .../org/apache/activemq/bugs/AMQ1853Test.java | 2 +- .../org/apache/activemq/bugs/AMQ1917Test.java | 2 +- .../org/apache/activemq/bugs/AMQ1936Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2149Test.java | 10 +++---- .../org/apache/activemq/bugs/AMQ2356Test.java | 2 +- .../org/apache/activemq/bugs/AMQ2832Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3014Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3120Test.java | 2 +- .../org/apache/activemq/bugs/AMQ3674Test.java | 2 +- .../org/apache/activemq/bugs/AMQ4062Test.java | 6 ++--- .../org/apache/activemq/bugs/AMQ4323Test.java | 2 +- .../org/apache/activemq/bugs/AMQ4504Test.java | 2 +- .../bugs/MemoryUsageBlockResumeTest.java | 4 +-- .../activemq/bugs/MemoryUsageCleanupTest.java | 6 ++--- ...ptimizeAcknowledgeWithExpiredMsgsTest.java | 2 +- .../bugs/TempStorageBlockedBrokerTest.java | 4 +-- .../bugs/TempStoreDataCleanupTest.java | 2 +- .../CheckDuplicateMessagesOnDuplexTest.java | 16 ++++++------ .../activemq/network/NetworkFailoverTest.java | 2 +- .../activemq/network/NetworkLoadTest.java | 4 +-- .../activemq/network/SimpleNetworkTest.java | 4 +-- .../transport/SoWriteTimeoutTest.java | 4 +-- ...FailoverConsumerOutstandingCommitTest.java | 2 +- .../failover/FailoverTransactionTest.java | 2 +- .../transport/tcp/InactivityMonitorTest.java | 2 +- .../tcp/WireformatNegociationTest.java | 20 +++++++------- .../transport/udp/UdpTestSupport.java | 2 +- .../BrokerQueueNetworkWithDisconnectTest.java | 2 +- .../DurableSubDelayedUnsubscribeTest.java | 2 +- .../DurableSubscriptionTestSupport.java | 6 ++--- ...MulticastDiscoveryOnFaultyNetworkTest.java | 2 +- .../NoDuplicateOnTopicNetworkTest.java | 6 ++--- .../usecases/ThreeBrokerTopicNetworkTest.java | 10 +++---- .../usecases/TopicReplicationTest.java | 2 +- .../TwoBrokerVirtualTopicForwardingTest.java | 6 ++--- .../ManagementContextXBeanConfigTest.java | 2 +- .../integration/client/AutogroupIdTest.java | 2 +- .../client/MessageExpirationTest.java | 2 +- .../clientcrash/ClientCrashTest.java | 2 +- .../clientcrash/ClientExitTest.java | 2 +- .../distribution/SymmetricClusterTest.java | 2 +- .../failover/AsynchronousFailoverTest.java | 2 +- .../jms/ActiveMQConnectionFactoryTest.java | 2 +- .../integration/jms/SimpleJNDIClientTest.java | 2 +- .../jms/connection/ExceptionListenerTest.java | 2 +- .../jms/jms2client/NonExistentQueueTest.java | 6 ++--- .../openwire/amq/JMSConsumer11Test.java | 8 +++--- .../amq/ProducerFlowControlSendFailTest.java | 8 +++--- .../openwire/amq/ProducerFlowControlTest.java | 10 +++---- .../openwire/amq/TimeStampTest.java | 2 +- .../PagingWithFailoverAndCountersTest.java | 2 +- .../tests/integration/proton/ProtonTest.java | 6 ++--- .../tests/integration/stomp/StompTest.java | 26 +++++++++---------- .../vertx/ActiveMQVertxUnitTest.java | 6 ++--- .../artemis/jms/tests/ConnectionTest.java | 2 +- .../message/JMSExpirationHeaderTest.java | 2 +- .../tests/message/MessageHeaderTestBase.java | 2 +- .../message/ObjectMessageDeliveryTest.java | 2 +- .../artemis/jms/SpawnedJMSServer.java | 2 +- .../connection/TopicConnectionTest.java | 4 +-- .../core/message/impl/MessageImplTest.java | 2 +- 142 files changed, 259 insertions(+), 259 deletions(-) diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java index 01a1d2c701b..63d956c9273 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java @@ -21,7 +21,7 @@ import io.netty.buffer.ByteBuf; /** - * A ActiveMQBuffer wraps a Netty's ChannelBuffer and is used throughout ActiveMQ Artemis code base. + * An ActiveMQBuffer wraps a Netty's ChannelBuffer and is used throughout ActiveMQ Artemis code base. *

* Instances of it can be obtained from {@link ActiveMQBuffers} factory. *

diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java index 040420aa793..34fee4d575f 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java @@ -53,12 +53,12 @@ public static ActiveMQBuffer dynamicBuffer(final byte[] bytes) } /** - * Creates a ActiveMQBuffer wrapping an underlying NIO ByteBuffer + * Creates an ActiveMQBuffer wrapping an underlying NIO ByteBuffer * * The position on this buffer won't affect the position on the inner buffer * * @param underlying the underlying NIO ByteBuffer - * @return a ActiveMQBuffer wrapping the underlying NIO ByteBuffer + * @return an ActiveMQBuffer wrapping the underlying NIO ByteBuffer */ public static ActiveMQBuffer wrappedBuffer(final ByteBuffer underlying) { @@ -70,10 +70,10 @@ public static ActiveMQBuffer wrappedBuffer(final ByteBuffer underlying) } /** - * Creates a ActiveMQBuffer wrapping an underlying byte array + * Creates an ActiveMQBuffer wrapping an underlying byte array * * @param underlying the underlying byte array - * @return a ActiveMQBuffer wrapping the underlying byte array + * @return an ActiveMQBuffer wrapping the underlying byte array */ public static ActiveMQBuffer wrappedBuffer(final byte[] underlying) { diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java index ac25f621afe..8ad6b2161b0 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.api.core; /** - * A ActiveMQ Artemis resource is not in a legal state (e.g. calling ClientConsumer.receive() if a + * An ActiveMQ Artemis resource is not in a legal state (e.g. calling ClientConsumer.receive() if a * MessageHandler is set). */ public final class ActiveMQIllegalStateException extends ActiveMQException diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java index d1985597462..0be8e7b5218 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java @@ -141,7 +141,7 @@ public byte[] generateDummyAddress() * If running java 6 or above, returns {@link NetworkInterface#getHardwareAddress()}, else return {@code null}. * The first hardware address is returned when iterating all the NetworkInterfaces * - * @return A byte array containing teh hardware address. + * @return A byte array containing the hardware address. */ public static byte[] getHardwareAddress() { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java index 5752a5b7070..adb2861ba2f 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java @@ -386,7 +386,7 @@ public static String getDefaultHapolicyBackupStrategy() // Will this server, if a backup, restart once it has been stopped because of failback or scaling down. private static boolean DEFAULT_RESTART_BACKUP = false; - // Whether a server will automatically stop when a another places a request to take over its place. The use case is when a regular server stops and its backup takes over its duties, later the main server restarts and requests the server (the former backup) to stop operating. + // Whether a server will automatically stop when another places a request to take over its place. The use case is when a regular server stops and its backup takes over its duties, later the main server restarts and requests the server (the former backup) to stop operating. private static boolean DEFAULT_ALLOW_AUTO_FAILBACK = true; // if we have to start as a replicated server this is the delay to wait before fail-back occurs @@ -1078,7 +1078,7 @@ public static boolean isDefaultRestartBackup() } /** - * Whether a server will automatically stop when a another places a request to take over its place. The use case is when a regular server stops and its backup takes over its duties, later the main server restarts and requests the server (the former backup) to stop operating. + * Whether a server will automatically stop when another places a request to take over its place. The use case is when a regular server stops and its backup takes over its duties, later the main server restarts and requests the server (the former backup) to stop operating. */ public static boolean isDefaultAllowAutoFailback() { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java index 4dc63c3bec8..20830ad586f 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java @@ -158,7 +158,7 @@ public interface Message * Returns the message timestamp. *
* The timestamp corresponds to the time this message - * was handled by a ActiveMQ Artemis server. + * was handled by an ActiveMQ Artemis server. */ long getTimestamp(); @@ -196,7 +196,7 @@ public interface Message boolean isLargeMessage(); /** - * Returns the message body as a ActiveMQBuffer + * Returns the message body as an ActiveMQBuffer */ ActiveMQBuffer getBodyBuffer(); @@ -211,7 +211,7 @@ public interface Message Message writeBodyBufferString(String string); /** - * Returns a copy of the message body as a ActiveMQBuffer. Any modification + * Returns a copy of the message body as an ActiveMQBuffer. Any modification * of this buffer should not impact the underlying buffer. */ ActiveMQBuffer getBodyBufferCopy(); @@ -285,7 +285,7 @@ public interface Message Message putCharProperty(String key, char value); /** - * Puts a int property in this message. + * Puts an int property in this message. * * @param key property name * @param value property value diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java index 327245fedc5..9619e7cb362 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java @@ -115,7 +115,7 @@ public final class ActiveMQClient public static final String DEFAULT_CORE_PROTOCOL = "CORE"; /** - * Creates a ActiveMQConnectionFactory; + * Creates an ActiveMQConnectionFactory; * * @return the ActiveMQConnectionFactory */ diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java index ae62d3653a5..7ab33d1680e 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java @@ -46,7 +46,7 @@ public interface ClientConsumer extends AutoCloseable *

* This call will block indefinitely until a message is received. *

- * Calling this method on a closed consumer will throw a ActiveMQException. + * Calling this method on a closed consumer will throw an ActiveMQException. * @return a ClientMessage * @throws ActiveMQException if an exception occurs while waiting to receive a message */ @@ -57,7 +57,7 @@ public interface ClientConsumer extends AutoCloseable *

* This call will block until a message is received or the given timeout expires. *

- * Calling this method on a closed consumer will throw a ActiveMQException. + * Calling this method on a closed consumer will throw an ActiveMQException. * @param timeout time (in milliseconds) to wait to receive a message * @return a message or {@code null} if the time out expired * @throws ActiveMQException if an exception occurs while waiting to receive a message @@ -74,7 +74,7 @@ public interface ClientConsumer extends AutoCloseable * Note however that there is a performance cost as an additional network trip to the server may * required to check the queue status. *

- * Calling this method on a closed consumer will throw a ActiveMQException. + * Calling this method on a closed consumer will throw an ActiveMQException. * @return a message or {@code null} if there are no messages in the queue for this consumer * @throws ActiveMQException if an exception occurs while waiting to receive a message */ @@ -83,7 +83,7 @@ public interface ClientConsumer extends AutoCloseable /** * Returns the MessageHandler associated to this consumer. *

- * Calling this method on a closed consumer will throw a ActiveMQException. + * Calling this method on a closed consumer will throw an ActiveMQException. * @return the MessageHandler associated to this consumer or {@code null} * @throws ActiveMQException if an exception occurs while getting the MessageHandler */ diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java index 2b2841d4c3b..c9558587863 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java @@ -586,7 +586,7 @@ ClientConsumer createConsumer(SimpleString queueName, * Queries information on a binding. * * @param address the address of the biding to query - * @return a AddressQuery containing information on the binding attached to the given address + * @return an AddressQuery containing information on the binding attached to the given address * @throws ActiveMQException if an exception occurs while querying the binding */ AddressQuery addressQuery(SimpleString address) throws ActiveMQException; diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java index 4e12e79b603..6a119aab0d1 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java @@ -25,7 +25,7 @@ * A ClientSessionFactory is the entry point to create and configure ActiveMQ Artemis resources to produce and consume messages. *
* It is possible to configure a factory using the setter methods only if no session has been created. - * Once a session is created, the configuration is fixed and any call to a setter method will throw a IllegalStateException. + * Once a session is created, the configuration is fixed and any call to a setter method will throw an IllegalStateException. */ public interface ClientSessionFactory extends AutoCloseable { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java index 776f9337f3e..5d7c466c7dd 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java @@ -19,7 +19,7 @@ import org.apache.activemq.artemis.api.core.Message; /** - * A SendAcknowledgementHandler notifies a client when an message sent asynchronously has been + * A SendAcknowledgementHandler notifies a client when a message sent asynchronously has been * received by the server. *

* If the session is not blocking when sending durable or non-durable messages, the session can set diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java index cb36f532edd..0343439fc98 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.api.core.management; /** - * A ActiveMQComponentControl is used to manage the life cycle of a ActiveMQ Artemis component. + * An ActiveMQComponentControl is used to manage the life cycle of an ActiveMQ Artemis component. */ public interface ActiveMQComponentControl { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java index b9faed4ae22..138bc463387 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java @@ -19,7 +19,7 @@ import javax.management.MBeanOperationInfo; /** - * A ActiveMQServerControl is used to manage ActiveMQ Artemis servers. + * An ActiveMQServerControl is used to manage ActiveMQ Artemis servers. */ public interface ActiveMQServerControl { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java index 8e48e245440..23afbd9c6ba 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java @@ -99,7 +99,7 @@ public static void putAttribute(final Message message, final String resourceName } /** - * Stores a operation invocation in a message to invoke the corresponding operation the value from the server resource. + * Stores an operation invocation in a message to invoke the corresponding operation the value from the server resource. * * @param message message * @param resourceName the name of the resource @@ -114,7 +114,7 @@ public static void putOperationInvocation(final Message message, } /** - * Stores a operation invocation in a message to invoke the corresponding operation the value from the server resource. + * Stores an operation invocation in a message to invoke the corresponding operation the value from the server resource. * * @param message message * @param resourceName the name of the server resource diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java index f1ebde27d29..ba3fad85ff9 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java @@ -248,11 +248,11 @@ public interface ActiveMQClientLogger extends BasicLogger void propertyNotInteger(String propName, String name); @LogMessage(level = Logger.Level.WARN) - @Message(id = 212044, value = "Property {0} must be an Long, it is {1}", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 212044, value = "Property {0} must be a Long, it is {1}", format = Message.Format.MESSAGE_FORMAT) void propertyNotLong(String propName, String name); @LogMessage(level = Logger.Level.WARN) - @Message(id = 212045, value = "Property {0} must be an Boolean, it is {1}", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 212045, value = "Property {0} must be a Boolean, it is {1}", format = Message.Format.MESSAGE_FORMAT) void propertyNotBoolean(String propName, String name); @LogMessage(level = Logger.Level.WARN) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java index 13d3fae4352..09cb114d05a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java @@ -208,7 +208,7 @@ public interface ActiveMQClientMessageBundle @Message(id = 119053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double", format = Message.Format.MESSAGE_FORMAT) IllegalArgumentException mustBeDouble(Node elem, String value); - @Message(id = 119054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as a Integer", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 119054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as an Integer", format = Message.Format.MESSAGE_FORMAT) IllegalArgumentException mustBeInteger(Node elem, String value); @Message(id = 119055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long", format = Message.Format.MESSAGE_FORMAT) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java index 0d54e169a21..b9cccecc873 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java @@ -78,7 +78,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal // while holding a lock or failover could dead lock eventually // And we can't use the sessionExecutor as that's being used for message handlers // for that reason we have a separate flowControlExecutor that's using the thread pool - // Which is a OrderedExecutor + // Which is an OrderedExecutor private final Executor flowControlExecutor; // Number of pending calls on flow control @@ -896,7 +896,7 @@ public void flowControl(final int messageBytes, final boolean discountSlowConsum // --------------------------------------------------------------------------------------- /** - * Sending a initial credit for slow consumers + * Sending an initial credit for slow consumers */ private void startSlowConsumer() { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java index a15f9f1dbc4..85e3d8d11d5 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java @@ -591,7 +591,7 @@ private void failoverOrReconnect(final Object connectionID, final ActiveMQExcept if (connection == null || !connection.getID().equals(connectionID) || !clientProtocolManager.isAlive()) { // We already failed over/reconnected - probably the first failure came in, all the connections were failed - // over then a async connection exception or disconnect + // over then an async connection exception or disconnect // came in for one of the already exitLoop connections, so we return true - we don't want to call the // listeners again diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java index 44803e81b56..363391a60b3 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java @@ -22,8 +22,8 @@ import java.util.zip.Inflater; /** - * An InflaterReader - * It takes an compressed input stream and decompressed it as it is being read. + * InflaterReader + * It takes a compressed input stream and decompressed it as it is being read. * Not for concurrent use. */ public class InflaterReader extends InputStream diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterWriter.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterWriter.java index 94df830d7ab..ddb34a15abc 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterWriter.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterWriter.java @@ -22,7 +22,7 @@ import java.util.zip.Inflater; /** - * A InflaterWriter + * InflaterWriter *

* This class takes an OutputStream. Compressed bytes * can directly be written into this class. The class will diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONArray.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONArray.java index 4e971be971e..daa570971d3 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONArray.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONArray.java @@ -686,7 +686,7 @@ public JSONArray put(final int value) } /** - * Append an long value. This increases the array's length by one. + * Append a long value. This increases the array's length by one. * * @param value A long value. * @return this. @@ -848,7 +848,7 @@ public JSONArray put(final int index, final Object value) throws JSONException } /** - * Remove a index and close the hole. + * Remove an index and close the hole. * @param index The index of the element to be removed. * @return The value that was associated with the index, * or null if there was no value. diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONObject.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONObject.java index 441c8cefcef..60d87dd85f8 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONObject.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONObject.java @@ -1385,7 +1385,7 @@ public static Object stringToValue(final String s) } /** - * Throw an exception if the object is an NaN or infinite number. + * Throw an exception if the object is a NaN or infinite number. * @param o The object to test. * @throws JSONException If o is a non-finite number. */ diff --git a/artemis-distribution/src/main/resources/README.html b/artemis-distribution/src/main/resources/README.html index 3114718c08e..f8327061faa 100644 --- a/artemis-distribution/src/main/resources/README.html +++ b/artemis-distribution/src/main/resources/README.html @@ -58,7 +58,7 @@

Creating a broker

-For a full list of availble options for the create process you may use: +For a full list of available options for the create process you may use: $ ./artemis help create 
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
index 32e1769bf5f..d1f932d5d5d 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
@@ -37,7 +37,7 @@
 public class ActiveMQJMSClient
 {
    /**
-    * Creates a ActiveMQConnectionFactory;
+    * Creates an ActiveMQConnectionFactory;
     *
     * @return the ActiveMQConnectionFactory
     */
@@ -48,7 +48,7 @@ public static ActiveMQConnectionFactory createConnectionFactory(final String url
    }
 
    /**
-    * Creates a ActiveMQConnectionFactory that receives cluster topology updates from the cluster as
+    * Creates an ActiveMQConnectionFactory that receives cluster topology updates from the cluster as
     * servers leave or join and new backups are appointed or removed.
     * 

     * The discoveryAddress and discoveryPort parameters in this method are used to listen for UDP
@@ -94,7 +94,7 @@ else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF))
    }
 
    /**
-    * Create a ActiveMQConnectionFactory which creates session factories from a set of live servers, no HA backup information is propagated to the client
+    * Create an ActiveMQConnectionFactory which creates session factories from a set of live servers, no HA backup information is propagated to the client
     *
     * The UDP address and port are used to listen for live servers in the cluster
     *
@@ -134,7 +134,7 @@ else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF))
    }
 
    /**
-    * Create a ActiveMQConnectionFactory which will receive cluster topology updates from the cluster
+    * Create an ActiveMQConnectionFactory which will receive cluster topology updates from the cluster
     * as servers leave or join and new backups are appointed or removed.
     * 

     * The initial list of servers supplied in this method is simply to make an initial connection to
@@ -180,7 +180,7 @@ else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF))
    }
 
    /**
-    * Create a ActiveMQConnectionFactory which creates session factories using a static list of
+    * Create an ActiveMQConnectionFactory which creates session factories using a static list of
     * transportConfigurations.
     * 

     * The ActiveMQConnectionFactory is not updated automatically as the cluster topology changes, and
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
index 0939795b3d6..c7504bb3856 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
@@ -54,7 +54,7 @@ public static void putAttribute(final Message message, final String resourceName
    }
 
    /**
-    * Stores a operation invocation in a JMS message to invoke the corresponding operation the value from the server resource.
+    * Stores an operation invocation in a JMS message to invoke the corresponding operation the value from the server resource.
     *
     * @param message JMS message
     * @param resourceName the name of the resource
@@ -89,7 +89,7 @@ private static JMSException convertFromException(final Exception e)
    }
 
    /**
-    * Stores a operation invocation in a JMS message to invoke the corresponding operation the value from the server resource.
+    * Stores an operation invocation in a JMS message to invoke the corresponding operation the value from the server resource.
     *
     * @param message JMS message
     * @param resourceName the name of the server resource
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index de536926abe..30397e8b33f 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -307,7 +307,7 @@ public MessageProducer createProducer(final Destination destination) throws JMSE
    {
       if (destination != null && !(destination instanceof ActiveMQDestination))
       {
-         throw new InvalidDestinationException("Not a ActiveMQ Artemis Destination:" + destination);
+         throw new InvalidDestinationException("Not an ActiveMQ Artemis Destination:" + destination);
       }
 
       try
@@ -364,7 +364,7 @@ public MessageConsumer createConsumer(final Destination destination,
 
       if (!(destination instanceof ActiveMQDestination))
       {
-         throw new InvalidDestinationException("Not a ActiveMQDestination:" + destination);
+         throw new InvalidDestinationException("Not an ActiveMQDestination:" + destination);
       }
 
       ActiveMQDestination jbdest = (ActiveMQDestination)destination;
@@ -460,7 +460,7 @@ public TopicSubscriber createDurableSubscriber(final Topic topic,
       checkTopic(topic);
       if (!(topic instanceof ActiveMQDestination))
       {
-         throw new InvalidDestinationException("Not a ActiveMQTopic:" + topic);
+         throw new InvalidDestinationException("Not an ActiveMQTopic:" + topic);
       }
       if ("".equals(messageSelector))
       {
@@ -881,7 +881,7 @@ public QueueBrowser createBrowser(final Queue queue, String filterString) throws
       }
       if (!(queue instanceof ActiveMQDestination))
       {
-         throw new InvalidDestinationException("Not a ActiveMQQueue:" + queue);
+         throw new InvalidDestinationException("Not an ActiveMQQueue:" + queue);
       }
       if ("".equals(filterString))
       {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java
index a9e8d48fedc..15509f96953 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java
@@ -21,7 +21,7 @@
 
 /**
  *
- * This class converts a JMS selector expression into a ActiveMQ Artemis core filter expression.
+ * This class converts a JMS selector expression into an ActiveMQ Artemis core filter expression.
  *
  * JMS selector and ActiveMQ Artemis filters use the same syntax but have different identifiers.
  *
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java
index bec515f3945..ca9ab6d721f 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java
@@ -27,7 +27,7 @@
  *
  * A ConnectionFactoryObjectFactory.
  *
- * Given a reference - reconstructs a ActiveMQRAConnectionFactory
+ * Given a reference - reconstructs an ActiveMQRAConnectionFactory
  */
 public class ConnectionFactoryObjectFactory implements ObjectFactory
 {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java
index 7d2f7c435eb..7ae8ed135fb 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java
@@ -27,7 +27,7 @@
  *
  * A DestinationObjectFactory.
  *
- * Given a Reference - reconstructs a ActiveMQDestination
+ * Given a Reference - reconstructs an ActiveMQDestination
  */
 public class DestinationObjectFactory implements ObjectFactory
 {
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index ee5d1ce588f..4424418edfc 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -1840,7 +1840,7 @@ private static void copyProperties(final Message msg) throws JMSException
 
             if (val instanceof byte[] == false)
             {
-               //Can't set byte[] array props through the JMS API - if we're bridging a ActiveMQ Artemis message it might have such props
+               //Can't set byte[] array props through the JMS API - if we're bridging an ActiveMQ Artemis message it might have such props
                msg.setObjectProperty(propName, entry.getValue());
             }
             else if (msg instanceof ActiveMQMessage)
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java
index a82b8a6f96d..b09ee884aee 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java
@@ -30,7 +30,7 @@
 
 /**
  * Simple bootstrap class that parses activemq config files (server and jms and security) and starts
- * a ActiveMQServer instance and populates it with configured JMS endpoints.
+ * an ActiveMQServer instance and populates it with configured JMS endpoints.
  * 

  * JMS Endpoints are registered with a simple MapBindingRegistry.  If you want to use a different registry
  * you must set the registry property of this class or call the setRegistry() method if you want to use JNDI
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectionContext.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectionContext.java
index e26e6b19a11..def94b6c658 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectionContext.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConnectionContext.java
@@ -52,7 +52,7 @@ public class AMQConnectionContext
    private boolean faultTolerant;
    private final AtomicBoolean stopping = new AtomicBoolean();
    private final MessageEvaluationContext messageEvaluationContext;
-   private boolean dontSendReponse;
+   private boolean dontSendResponse;
    private boolean clientMaster = true;
    private ConnectionState connectionState;
    private XATransactionId xid;
@@ -97,7 +97,7 @@ public AMQConnectionContext copy()
       rc.networkConnection = this.networkConnection;
       rc.faultTolerant = this.faultTolerant;
       rc.stopping.set(this.stopping.get());
-      rc.dontSendReponse = this.dontSendReponse;
+      rc.dontSendResponse = this.dontSendResponse;
       rc.clientMaster = this.clientMaster;
       return rc;
    }
@@ -334,12 +334,12 @@ public AtomicBoolean getStopping()
 
    public void setDontSendReponse(boolean b)
    {
-      this.dontSendReponse = b;
+      this.dontSendResponse = b;
    }
 
    public boolean isDontSendReponse()
    {
-      return dontSendReponse;
+      return dontSendResponse;
    }
 
    /**
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java
index 03436d1ac7e..f683eea5cda 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java
@@ -105,7 +105,7 @@ public interface AMQSubscription extends AMQSubscriptionRecovery
    void gc();
 
    /**
-    * Used by a Slave Broker to update dispatch infomation
+    * Used by a Slave Broker to update dispatch information
     * @param mdn
     * @throws Exception
     */
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
index e158a74f64a..31ac8a4b92c 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
@@ -28,7 +28,7 @@
 import org.proton.plug.util.NettyWritable;
 
 /**
- * A this is a wrapper around a ActiveMQ Artemis ServerConsumer for handling outgoing messages and incoming acks via a Proton Sender
+ * A this is a wrapper around an ActiveMQ Artemis ServerConsumer for handling outgoing messages and incoming acks via a Proton Sender
  */
 public abstract class AbstractProtonContextSender extends ProtonInitializable implements ProtonDeliveryHandler
 {
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
index 453e466d96b..51176e60410 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
@@ -183,7 +183,7 @@ public boolean hasBytes()
     * terminated with a null character
     *
     * Note: This is the decoder for 1.0 stomp frames. However to support for stomp 1.1
-    * and 1.2, it is also responsible for giving out an proper exception when it detects
+    * and 1.2, it is also responsible for giving out a proper exception when it detects
     * unsupported EOLs ("\r\n" valid for 1.2 only). The StompConnection will switch
     * to proper version decoders on catching such exceptions.
     */
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
index 94f66dfff09..9d585373db5 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
@@ -24,7 +24,7 @@
 
 
 /**
- * A ActiveMQRAService ensures that ActiveMQ Artemis Resource Adapter will be stopped *before* the ActiveMQ Artemis server.
+ * An ActiveMQRAService ensures that ActiveMQ Artemis Resource Adapter will be stopped *before* the ActiveMQ Artemis server.
  * https://jira.jboss.org/browse/HORNETQ-339
  */
 public class ActiveMQRAService
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java
index de5488782d9..62230f1d4da 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java
@@ -24,7 +24,7 @@
 import org.jboss.resteasy.spi.Link;
 
 /**
- * Forwarding to a ActiveMQ/REST-* endpoing
+ * Forwarding to an ActiveMQ/REST-* endpoing
  */
 public class ActiveMQPushStrategy extends UriTemplateStrategy
 {
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
index e1fc014d73e..2aecfbcb3af 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
@@ -156,7 +156,7 @@ public Object evaluate(Filterable message) throws FilterException
          {
             return Boolean.FALSE;
             // throw new RuntimeException("LIKE can only operate on String
-            // identifiers. LIKE attemped on: '" + rv.getClass());
+            // identifiers. LIKE attempted on: '" + rv.getClass());
          }
 
          return likePattern.matcher((String) rv).matches() ? Boolean.TRUE : Boolean.FALSE;
@@ -230,7 +230,7 @@ public static BooleanExpression createEqual(Expression left, Expression right)
    {
       checkEqualOperand(left);
       checkEqualOperand(right);
-      checkEqualOperandCompatability(left, right);
+      checkEqualOperandCompatibility(left, right);
       return doCreateEqual(left, right);
    }
 
@@ -393,7 +393,7 @@ public static void checkEqualOperand(Expression expr)
     * @param left
     * @param right
     */
-   private static void checkEqualOperandCompatability(Expression left, Expression right)
+   private static void checkEqualOperandCompatibility(Expression left, Expression right)
    {
       if (left instanceof ConstantExpression && right instanceof ConstantExpression)
       {
diff --git a/artemis-selector/src/main/javacc/HyphenatedParser.jj b/artemis-selector/src/main/javacc/HyphenatedParser.jj
index f7ea82e536b..8beb85a2c4f 100755
--- a/artemis-selector/src/main/javacc/HyphenatedParser.jj
+++ b/artemis-selector/src/main/javacc/HyphenatedParser.jj
@@ -134,7 +134,7 @@ TOKEN [IGNORE_CASE] :
 }
 
 // ----------------------------------------------------------------------------
-// Grammer
+// Grammar
 // ----------------------------------------------------------------------------
 BooleanExpression JmsSelector() :
 {
diff --git a/artemis-selector/src/main/javacc/StrictParser.jj b/artemis-selector/src/main/javacc/StrictParser.jj
index 1085813c135..2be6725f3cf 100755
--- a/artemis-selector/src/main/javacc/StrictParser.jj
+++ b/artemis-selector/src/main/javacc/StrictParser.jj
@@ -134,7 +134,7 @@ TOKEN [IGNORE_CASE] :
 }
 
 // ----------------------------------------------------------------------------
-// Grammer
+// Grammar
 // ----------------------------------------------------------------------------
 BooleanExpression JmsSelector() :
 {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
index ca9a41ea656..00b414ddb26 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
@@ -29,7 +29,7 @@
 import org.apache.activemq.artemis.core.server.ServerMessage;
 
 /**
-* This class implements a ActiveMQ Artemis filter
+* This class implements an ActiveMQ Artemis filter
 *
 * ActiveMQ Artemis filters have the same syntax as JMS 1.1 selectors, but the identifiers are different.
 *
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
index c3ed030538b..255fc512854 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
@@ -138,7 +138,7 @@ public void run()
    public synchronized void onTimer()
    {
       // Actor approach here: Instead of having the Counter locking the queue, we will use the Queue's executor
-      // instead of possibly making an lock on the queue.
+      // instead of possibly making a lock on the queue.
       // This way the scheduled Threads will be free to keep doing their pings in case the server is busy with paging or
       // any other deliveries
       serverQueue.getExecutor().execute(onTimeExecutor);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
index 1706b825fce..79f2aac4665 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
@@ -396,14 +396,14 @@ public ItemOper(PageSubscriptionCounterImpl counter, long id, int add)
       {
          this.counter = counter;
          this.id = id;
-         this.ammount = add;
+         this.amount = add;
       }
 
       PageSubscriptionCounterImpl counter;
 
       long id;
 
-      int ammount;
+      int amount;
    }
 
    private static class CounterOperations extends TransactionOperationAbstract implements TransactionOperation
@@ -415,7 +415,7 @@ public void afterCommit(Transaction tx)
       {
          for (ItemOper oper : operations)
          {
-            oper.counter.incrementProcessed(oper.id, oper.ammount);
+            oper.counter.incrementProcessed(oper.id, oper.amount);
          }
       }
    }
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
index 083ee4a2b38..066c29bac74 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
@@ -281,7 +281,7 @@ else if (rolledback)
    // Inner classes -------------------------------------------------
 
    /** a Message shouldn't be delivered until it's committed
-    *  For that reason the page-refernce will be written right away
+    *  For that reason the page-reference will be written right away
     *  But in certain cases we can only deliver after the commit
     *  For that reason we will perform a late delivery
     *  through the method redeliver.
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServers.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServers.java
index 75552d3ceb8..79cd370622c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServers.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServers.java
@@ -28,7 +28,7 @@
 /**
  * ActiveMQServers is a factory class for instantiating ActiveMQServer instances.
  * 

- * This class should be used when you want to instantiate a ActiveMQServer instance for embedding in
+ * This class should be used when you want to instantiate an ActiveMQServer instance for embedding in
  * your own application, as opposed to directly instantiating an implementing instance.
  */
 public final class ActiveMQServers
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java
index 44cf136fb18..3cb048dfe2e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java
@@ -295,7 +295,7 @@ public synchronized void voteComplete()
       }
    }
    /**
-    * this will connect to a node and then cast a vote. whether or not this vote is asked of the target node is dependant
+    * this will connect to a node and then cast a vote. whether or not this vote is asked of the target node is dependent
     * on {@link org.apache.activemq.artemis.core.server.cluster.qourum.Vote#isRequestServerVote()}
     */
    private final class VoteRunnable implements Runnable
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVote.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVote.java
index 9e28d17b792..7ad4aa510d0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVote.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVote.java
@@ -32,7 +32,7 @@ public QuorumVote(SimpleString name)
    }
 
    /**
-    * called by the {@link org.apache.activemq.artemis.core.server.cluster.qourum.QuorumManager} when one of teh nodes in the quorum is
+    * called by the {@link org.apache.activemq.artemis.core.server.cluster.qourum.QuorumManager} when one of the nodes in the quorum is
     * successfully connected to. The QuorumVote can then decide whether or not a decision can be made with just that information.
     *
     * @return the vote to use
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 8e0d1ff3758..29a45090e99 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -106,7 +106,7 @@ public class QueueImpl implements Queue
    public static final int CHECK_QUEUE_SIZE_PERIOD = 100;
 
    /**
-    * If The system gets slow for any reason, this is the maximum time an Delivery or
+    * If The system gets slow for any reason, this is the maximum time a Delivery or
     * or depage executor should be hanging on
     */
    public static final int DELIVERY_TIMEOUT = 1000;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
index 6fd75b0bd06..c548cd9391e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
@@ -25,7 +25,7 @@
 import org.apache.activemq.artemis.core.server.impl.RefsOperation;
 
 /**
- * A ActiveMQ Artemis internal transaction
+ * An ActiveMQ Artemis internal transaction
  */
 public interface Transaction
 {
diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
index af28c092fc0..6f2583108a2 100644
--- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd
+++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
@@ -1223,7 +1223,7 @@
          
             
                
-                  DEPRECATED: use message-load-balancing-type instead. Select STRICT to mimic foward-when-no-consumers=true
+                  DEPRECATED: use message-load-balancing-type instead. Select STRICT to mimic forward-when-no-consumers=true
                   and ON_DEMAND to mimic forward-when-no-consumers=false.
                
             
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index aed2891d9f9..26e9bb529ff 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -1093,7 +1093,7 @@ protected static void expectActiveMQException(final String message, final Active
 
    protected static void expectActiveMQException(final ActiveMQExceptionType errorCode, final ActiveMQAction action)
    {
-      expectActiveMQException("must throw a ActiveMQException with the expected errorCode: " + errorCode,
+      expectActiveMQException("must throw an ActiveMQException with the expected errorCode: " + errorCode,
                               errorCode,
                               action);
    }
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
index d9c3cb7a15e..f814f1b680f 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
@@ -31,7 +31,7 @@ public class ActiveMQXAResourceWrapperImpl implements ActiveMQXAResourceWrapper
    // The EIS Version
    private final String productVersion;
 
-   // A composite of NodeID + JNDIName that allows adminstrator looking at an XAResource to determine it's origin.
+   // A composite of NodeID + JNDIName that allows administrator looking at an XAResource to determine it's origin.
    private final String jndiNameNodeId;
 
    /**
diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md
index 1998ec2b43f..fc5c04a6e60 100644
--- a/docs/user-manual/en/clusters.md
+++ b/docs/user-manual/en/clusters.md
@@ -711,14 +711,14 @@ specified. The following shows all the available configuration options
     Apache ActiveMQ Artemis will *not* forward messages to other nodes
     if there are no *queues* of the same name on the other nodes, even
     if this parameter is set to `STRICT`. Using `STRICT` is like setting
-    the legacy `foward-when-no-consumers` parameter to `true`.
+    the legacy `forward-when-no-consumers` parameter to `true`.
 
     If this is set to `ON_DEMAND` then Apache ActiveMQ Artemis will only
     forward messages to other nodes of the cluster if the address to which
     they are being forwarded has queues which have consumers, and if those
     consumers have message filters (selectors) at least one of those
     selectors must match the message. Using `ON_DEMAND` is like setting
-    the legacy `foward-when-no-consumers` parameter to `false`.
+    the legacy `forward-when-no-consumers` parameter to `false`.
 
     Default is `ON_DEMAND`.
 
diff --git a/docs/user-manual/en/configuring-transports.md b/docs/user-manual/en/configuring-transports.md
index 6ac2886cc1c..1e18b4d740c 100644
--- a/docs/user-manual/en/configuring-transports.md
+++ b/docs/user-manual/en/configuring-transports.md
@@ -27,7 +27,7 @@ In the above example we're defining an acceptor that uses
 The `acceptor` element contains a `URI` that defines the kind of Acceptor
 to create along with its configuration. The `schema` part of the `URI`
 defines the Acceptor type which can either be `tcp` or `vm` which is
-`Netty` or an In VM Acceptor respectively. For `Netty` teh host and the
+`Netty` or an In VM Acceptor respectively. For `Netty` the host and the
 port of the `URI` define what host and port the Acceptor will bind to. For
 In VM the `Authority` part of the `URI` defines a unique server id.
 
diff --git a/docs/user-manual/en/ha.md b/docs/user-manual/en/ha.md
index 5112ba135a6..e0e032db312 100644
--- a/docs/user-manual/en/ha.md
+++ b/docs/user-manual/en/ha.md
@@ -53,7 +53,7 @@ which we will cover in a later chapter.
 >
 > The `ha-policy` configurations replaces any current HA configuration
 > in the root of the `broker.xml` configuration. All old
-> configuration is now deprecated altho best efforts will be made to
+> configuration is now deprecated although best efforts will be made to
 > honour it if configured this way.
 
 > **Note**
diff --git a/docs/user-manual/en/rest.md b/docs/user-manual/en/rest.md
index dbafbcfa287..30c7a712653 100644
--- a/docs/user-manual/en/rest.md
+++ b/docs/user-manual/en/rest.md
@@ -589,7 +589,7 @@ headers. here's an example of that.
 
 You can set the time to live, expiration, and/or the priority of the
 message in the queue or topic by setting an additional query parameter.
-The `expiration` query parameter is an long specify the time in
+The `expiration` query parameter is a long specifying the time in
 milliseconds since epoch (a long date). The `ttl` query parameter is a
 time in milliseconds you want the message active. The `priority` is
 another query parameter with an integer value between 0 and 9 expressing
@@ -651,7 +651,7 @@ parameters (`application/x-www-form-urlencoded`) described below.
     in which the consumer connections will be closed if idle.
 
 -   `delete-when-idle`. Boolean value, If true, a topic subscription
-    will be deleted (even if it is durable) when an the idle timeout is
+    will be deleted (even if it is durable) when the idle timeout is
     reached.
 
 > **Note**
@@ -920,7 +920,7 @@ Here is an example of creating an auto-acknowledged queue pull consumer.
     you'll see later, it is transmitted with each response just to
     remind you.
 
-Creating an manually-acknowledged consumer for a topic is pretty much
+Creating a manually-acknowledged consumer for a topic is pretty much
 the same. Here's an example of creating a durable manually-acknowledged
 topic pull subscription.
 
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index 5a493427470..eeb36c16d4a 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -164,7 +164,7 @@ just a set of key value pairs that define the users and their password, like so:
     sam=activemq3
 
 The `artemis-roles.properties` defines what groups these users belong too
-where the key is the user and the value is a comma seperated list of the groups
+where the key is the user and the value is a comma separated list of the groups
 the user belongs to, like so:
 
     bill=user
diff --git a/docs/user-manual/en/using-jms.md b/docs/user-manual/en/using-jms.md
index 3a244d73587..d90851fb090 100644
--- a/docs/user-manual/en/using-jms.md
+++ b/docs/user-manual/en/using-jms.md
@@ -111,7 +111,7 @@ host:port combinations in the URL (e.g.
 many host:port combinations in the URL they are treated as the *initial
 connector(s)* for the underlying connection.
 
-The `udp` scheme is also supported which should use an host:port
+The `udp` scheme is also supported which should use a host:port
 combination that matches the `group-address` and `group-port` from the
 corresponding `broadcast-group` configured on the ActiveMQ Artemis server(s).
 
diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
index 694f64bd864..fe3d84686f3 100644
--- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
+++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
@@ -32,7 +32,7 @@
 
 /**
  *
- * This example shows how to run a ActiveMQ Artemis core client and server embedded in your
+ * This example shows how to run an ActiveMQ Artemis core client and server embedded in your
  * own application
  */
 public class EmbeddedRemoteExample
diff --git a/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java b/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
index 83ec200e38e..17395b67a6c 100644
--- a/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
+++ b/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
@@ -35,7 +35,7 @@
 
 /**
  *
- * This example shows how to run a ActiveMQ Artemis core client and server embedded in your
+ * This example shows how to run an ActiveMQ Artemis core client and server embedded in your
  * own application
  */
 public class EmbeddedExample
diff --git a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
index a0731ab9d0b..597ea5fc409 100644
--- a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
+++ b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
@@ -77,7 +77,7 @@ public void onException(final JMSException e)
          // Step 5. We start the connection
          connection.start();
 
-         // Step 6. Create a ActiveMQServerControlMBean proxy to manage the server
+         // Step 6. Create an ActiveMQServerControlMBean proxy to manage the server
          ObjectName on = ObjectNameBuilder.DEFAULT.getActiveMQServerObjectName();
          JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(JMX_URL), new HashMap());
          MBeanServerConnection mbsc = connector.getMBeanServerConnection();
diff --git a/examples/jms/client-side-failoverlistener/readme.html b/examples/jms/client-side-failoverlistener/readme.html
index ad6abe01f9d..c58abc68e70 100644
--- a/examples/jms/client-side-failoverlistener/readme.html
+++ b/examples/jms/client-side-failoverlistener/readme.html
@@ -30,7 +30,7 @@ 
Client Side Kickoff Example

      
This example demonstrates how you can listen on failover event on the client side.

 
      
In this example there are two nodes running in a cluster, both server will be running for start,
-        but after a while the first server will crash. This will trigger an fail-over event.

+        but after a while the first server will crash. This will trigger a fail-over event.

          
      
Example step-by-step

      
To run the example, simply type mvn verify -Pexample from this directory

diff --git a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
index 01f05dc6252..20c8808b95f 100644
--- a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
+++ b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
@@ -34,7 +34,7 @@
  * This example demonstrates how you can listen on failover event on the client side
  *
  * In this example there are two nodes running in a cluster, both server will be running for start,
- * but after a while the first server will crash. This will trigger an fail oever event
+ * but after a while the first server will crash. This will trigger a fail-over event
  */
 public class ClientSideFailoverListerExample extends ActiveMQExample
 {
diff --git a/examples/jms/clustered-durable-subscription/readme.html b/examples/jms/clustered-durable-subscription/readme.html
index 440d2816533..0d172142ac9 100644
--- a/examples/jms/clustered-durable-subscription/readme.html
+++ b/examples/jms/clustered-durable-subscription/readme.html
@@ -172,7 +172,7 @@ 
Example step-by-step

         We now consume those messages on *both* server 0 and server 1.
         Note that the messages have been load-balanced between the two nodes, with some
         messages on node 0 and others on node 1.
-        The "logical" subscription is distributed across the cluster an contains exactly one copy of all the messages sent.
+        The "logical" subscription is distributed across the cluster and contains exactly one copy of all the messages sent.
          
         
            
diff --git a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
index e297ff698f1..c5b3be41d68 100644
--- a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
+++ b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
@@ -133,7 +133,7 @@ public boolean runExample() throws Exception
          // Step 14. We now consume those messages on *both* server 0 and server 1.
          // Note that the messages have been load-balanced between the two nodes, with some
          // messages on node 0 and others on node 1.
-         // The "logical" subscription is distributed across the cluster an contains exactly one copy of all the
+         // The "logical" subscription is distributed across the cluster and contains exactly one copy of all the
          // messages
 
          for (int i = 0; i < numMessages; i += 2)
diff --git a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
index f42257f260c..82218730862 100644
--- a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
@@ -36,7 +36,7 @@
 import org.apache.activemq.artemis.api.jms.JMSFactoryType;
 
 /**
- * This example demonstrates how to run a ActiveMQ Artemis embedded with JMS
+ * This example demonstrates how to run an ActiveMQ Artemis embedded with JMS
  */
 public class EmbeddedExample extends ActiveMQExample
 {
diff --git a/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java b/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
index 255bf738224..93000585566 100644
--- a/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
@@ -42,7 +42,7 @@
 import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
 
 /**
- * This example demonstrates how to run a ActiveMQ Artemis embedded with JMS
+ * This example demonstrates how to run an ActiveMQ Artemis embedded with JMS
  */
 public final class EmbeddedExample extends ActiveMQExample
 {
diff --git a/examples/jms/expiry/readme.html b/examples/jms/expiry/readme.html
index 24b3ff7c4f9..acbbe4bbeaa 100644
--- a/examples/jms/expiry/readme.html
+++ b/examples/jms/expiry/readme.html
@@ -27,11 +27,11 @@
   
      
JMS Expiration Example

 
-     
This example shows you how to configure ActiveMQ Artemis so messages are expipired after a certain time..

+     
This example shows you how to configure ActiveMQ Artemis so messages are expipired after a certain time.

      
Messages can be retained in the messaging system for a limited period of time before being removed.
          JMS specification states that clients should not receive messages that have been expired (but it does not guarantee this will not happen).

      
ActiveMQ Artemis can assign a expiry address to a given queue so that when messages are expired, they are removed from the queue and
-        routed to an this address. These "expired" messages can later be consumed for further inspection.
+        routed to this address. These "expired" messages can later be consumed for further inspection.
      

          The example will send 1 message with a short time-to-live to a queue. We will wait for the message to expire and checks that the message
          is no longer in the queue it was sent to.
diff --git a/examples/jms/message-counters/readme.html b/examples/jms/message-counters/readme.html
index 8a7f4c22ead..63b5d97f99f 100644
--- a/examples/jms/message-counters/readme.html
+++ b/examples/jms/message-counters/readme.html
@@ -43,7 +43,7 @@ 
Example setup

      Queues are sampled every 10 seconds by default. For this example we will reduce it to 2 seconds by setting message-counter-sample-period to 2000.

      ActiveMQ Artemis holds in memory the message counters' history for a maximum number of days (10 by default). We can change the number of days the history is kept by setting
          the message-counter-max-day-history parameter.

-     
The sample period and the max day history parameters have an small impact on the performance of ActiveMQ Artemis (the resources taken to sample a queue are not available to the system's
+     
The sample period and the max day history parameters have a small impact on the performance of ActiveMQ Artemis (the resources taken to sample a queue are not available to the system's
          normal use). You should set these parameters accordingly to the use and throughput of your messages.

          
      
Example step-by-step

diff --git a/examples/soak/normal/README b/examples/soak/normal/README
index 0a4dfe93ec2..54ec245329d 100644
--- a/examples/soak/normal/README
+++ b/examples/soak/normal/README
@@ -22,7 +22,7 @@ system property (which defaults to server0). To run a 2nd server with a configur
 
    $ mvn verify -Pserver -Dserver.dir=server1
 
-server1 should contain a copy of configuration equivilent to that found under the server0 director with different
+server1 should contain a copy of configuration equivalent to that found under the server0 director with different
 settings.
 
 To run a server with the same configuration but on a different host.  Check out this source on the host machine and
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java
index a9e1b24fa9e..a6908a0afad 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java
@@ -157,7 +157,7 @@ public void doTestSynchRecover() throws JMSException {
     }
 
     /**
-     * Test to make sure that a Async recover works.
+     * Test to make sure that an Async recover works.
      * 
      * @throws JMSException
      * @throws InterruptedException
@@ -226,7 +226,7 @@ public void onMessage(Message msg) {
     }
 
     /**
-     * Test to make sure that a Async recover works when using AUTO_ACKNOWLEDGE.
+     * Test to make sure that an Async recover works when using AUTO_ACKNOWLEDGE.
      * 
      * @throws JMSException
      * @throws InterruptedException
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
index c18eccd093a..12aa47d23fe 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
@@ -58,17 +58,17 @@ protected BrokerService createBroker() throws Exception {
     }
     
     @Override
-    public void test2ndPubisherWithStandardConnectionThatIsBlocked() throws Exception {
+    public void test2ndPublisherWithStandardConnectionThatIsBlocked() throws Exception {
         // with sendFailIfNoSpace set, there is no blocking of the connection
     }
     
     @Override
-    public void testAsyncPubisherRecoverAfterBlock() throws Exception {
+    public void testAsyncPublisherRecoverAfterBlock() throws Exception {
         // sendFail means no flowControllwindow as there is no producer ack, just an exception
     }
     
     @Override
-    public void testPubisherRecoverAfterBlock() throws Exception {
+    public void testPublisherRecoverAfterBlock() throws Exception {
         ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory)createConnectionFactory();
         // with sendFail, there must be no flowControllwindow
         // sendFail is an alternative flow control mechanism that does not block
@@ -116,7 +116,7 @@ public void run() {
         keepGoing.set(false);
     }
 
-    public void testPubisherRecoverAfterBlockWithSyncSend() throws Exception {
+    public void testPublisherRecoverAfterBlockWithSyncSend() throws Exception {
         ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory)createConnectionFactory();
         factory.setExceptionListener(null);
         factory.setUseAsyncSend(false);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
index 70e15eca7dd..a79e738329f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
@@ -49,7 +49,7 @@ public class ProducerFlowControlTest extends JmsTestSupport {
     // used to test sendFailIfNoSpace on SystemUsage 
     protected final AtomicBoolean gotResourceException = new AtomicBoolean(false);
 
-    public void test2ndPubisherWithProducerWindowSendConnectionThatIsBlocked() throws Exception {
+    public void test2ndPublisherWithProducerWindowSendConnectionThatIsBlocked() throws Exception {
         ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory)createConnectionFactory();
         factory.setProducerWindowSize(1024 * 64);
         connection = (ActiveMQConnection)factory.createConnection();
@@ -80,7 +80,7 @@ public void test2ndPubisherWithProducerWindowSendConnectionThatIsBlocked() throw
         msg.acknowledge();
     }
 
-    public void testPubisherRecoverAfterBlock() throws Exception {
+    public void testPublisherRecoverAfterBlock() throws Exception {
         ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory)createConnectionFactory();
         connection = (ActiveMQConnection)factory.createConnection();
         connections.add(connection);
@@ -125,7 +125,7 @@ public void run() {
 		assertFalse("producer has resumed", done.get());
     }
 
-    public void testAsyncPubisherRecoverAfterBlock() throws Exception {
+    public void testAsyncPublisherRecoverAfterBlock() throws Exception {
         ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory)createConnectionFactory();
         factory.setProducerWindowSize(1024 * 5);
         factory.setUseAsyncSend(true);
@@ -173,7 +173,7 @@ public void run() {
         assertFalse("producer has resumed", done.get());
     }
 
-    public void test2ndPubisherWithSyncSendConnectionThatIsBlocked() throws Exception {
+    public void test2ndPublisherWithSyncSendConnectionThatIsBlocked() throws Exception {
         ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory)createConnectionFactory();
         factory.setAlwaysSyncSend(true);
         connection = (ActiveMQConnection)factory.createConnection();
@@ -229,7 +229,7 @@ public void testSimpleSendReceive() throws Exception {
         msg.acknowledge();
     }
 
-    public void test2ndPubisherWithStandardConnectionThatIsBlocked() throws Exception {
+    public void test2ndPublisherWithStandardConnectionThatIsBlocked() throws Exception {
         ConnectionFactory factory = createConnectionFactory();
         connection = (ActiveMQConnection)factory.createConnection();
         connections.add(connection);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/TimeStampTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/TimeStampTest.java
index 2ec57b5aaff..448bd3cba89 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/TimeStampTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/TimeStampTest.java
@@ -85,7 +85,7 @@ public void test() throws Exception {
                                                                                                             && receivedMessage.getJMSTimestamp() <= afterSend);
 
         // assert message timestamp is unchanged
-        assertEquals("JMS Message Timestamp of recieved message should be the same as the sent message\n        ", sentMessage.getJMSTimestamp(), receivedMessage.getJMSTimestamp());
+        assertEquals("JMS Message Timestamp of received message should be the same as the sent message\n        ", sentMessage.getJMSTimestamp(), receivedMessage.getJMSTimestamp());
 
         // Clean up
         producer.close();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java
index 2facb98f6ff..fc3438e1440 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java
@@ -758,7 +758,7 @@ public void testTopicRetroactiveConsumerSeeMessagesBeforeCreation() throws Excep
 
     //
     // TODO: need to reimplement this since we don't fail when we send to a
-    // non-existant
+    // non-existent
     // destination. But if we can access the Region directly then we should be
     // able to
     // check that if the destination was removed.
@@ -843,7 +843,7 @@ public void testTopicRetroactiveConsumerSeeMessagesBeforeCreation() throws Excep
     // ActiveMQDestination.createDestination(connectionInfo1.getConnectionId()+":1",
     // destinationType);
     //            
-    // // Should not be able to send to a non-existant temp destination.
+    // // Should not be able to send to a non-existent temp destination.
     // try {
     // connection1.request(createMessage(producerInfo1, destination,
     // deliveryMode));
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java
index 491a585de4f..e56306397b8 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java
@@ -358,7 +358,7 @@ public void testQueueNonPersistentMessagesLostOnRestart() throws Exception {
         assertNoMessagesLeft(connection);
     }
 
-    public void testQueuePersistentCommitedMessagesNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommittedMessagesNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = new ActiveMQQueue("TEST");
 
@@ -406,7 +406,7 @@ public void testQueuePersistentCommitedMessagesNotLostOnRestart() throws Excepti
     }
     
 
-    public void testQueuePersistentCommitedAcksNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommittedAcksNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = new ActiveMQQueue("TEST");
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
index 2c4167359a8..6c25796e6eb 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
@@ -455,7 +455,7 @@ public void testTopicPreparedTransactionRecoveredOnRestart() throws Exception {
 
     }
 
-    public void testQueuePersistentCommitedMessagesNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommittedMessagesNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = createDestination();
 
@@ -502,7 +502,7 @@ public void testQueuePersistentCommitedMessagesNotLostOnRestart() throws Excepti
         assertNoMessagesLeft(connection);
     }
 
-    public void testQueuePersistentCommited2PhaseMessagesNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommitted2PhaseMessagesNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = createDestination();
 
@@ -551,7 +551,7 @@ public void testQueuePersistentCommited2PhaseMessagesNotLostOnRestart() throws E
         assertNoMessagesLeft(connection);
     }
 
-    public void testQueuePersistentCommitedAcksNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommittedAcksNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = createDestination();
 
@@ -691,8 +691,8 @@ public void testQueuePersistentPreparedAcksNotLostOnRestart() throws Exception {
         dataArrayResponse = (DataArrayResponse)connection.request(recoverInfo);
         assertEquals("there are no prepared tx", 0, dataArrayResponse.getData().length);
 
-        assertEquals("enqueue count does not see commited acks", 0, destinationView.getQueueSize());
-        assertEquals("enqueue count does not see commited acks", 4, destinationView.getDequeueCount());
+        assertEquals("enqueue count does not see committed acks", 0, destinationView.getQueueSize());
+        assertEquals("enqueue count does not see committed acks", 4, destinationView.getDequeueCount());
 
     }
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java
index 6910bed2777..cf1b7672d13 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java
@@ -278,13 +278,13 @@ public boolean isSatisified() throws Exception {
 
         try {
             view.removeConnector("tcp");
-            fail("Should have thrown an NoSuchElementException");
+            fail("Should have thrown a NoSuchElementException");
         } catch(NoSuchElementException e) {
         }
 
         try {
             view.removeNetworkConnector("tcp");
-            fail("Should have thrown an NoSuchElementException");
+            fail("Should have thrown a NoSuchElementException");
         } catch(NoSuchElementException e) {
         }
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index e2b0c516964..b679313fc19 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -299,7 +299,7 @@ public void testRetryMessages() throws Exception {
         long queueSize = queue.getQueueSize();
         compdatalist = queue.browse();
         int actualCount = compdatalist.length;
-        echo("Orginal queue size is now " + queueSize);
+        echo("Original queue size is now " + queueSize);
         echo("Original browse queue size: " + actualCount);
 
         long dlqSize = dlq.getQueueSize();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
index b84a782c4b5..bc0fab72250 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
@@ -192,7 +192,7 @@ public void testGetExecutionCount() throws Exception {
         scheduler.addListener(new JobListener() {
             @Override
             public void scheduledJob(String id, ByteSequence job) {
-                LOG.info("Job exectued: {}", 11 - done.getCount());
+                LOG.info("Job executed: {}", 11 - done.getCount());
                 done.countDown();
             }
         });
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDLQTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDLQTest.java
index 7c853cfd927..f81ca719912 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDLQTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDLQTest.java
@@ -374,7 +374,7 @@ public void run() {
 
         public synchronized void onException(JMSException ex) {
             ex.printStackTrace();
-            LOG.error("Consumer for destination, (" + destinationName + "), JMS Exception occured.  Shutting down client.");
+            LOG.error("Consumer for destination, (" + destinationName + "), JMS Exception occurred.  Shutting down client.");
         }
 
         public synchronized void setStop(boolean bStop) {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1853Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1853Test.java
index a3c3b1d966d..51693483c4a 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1853Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1853Test.java
@@ -311,7 +311,7 @@ public void run() {
         }
 
         public synchronized void onException(JMSException ex) {
-            LOG.error("Consumer for destination, (" + destinationName + "), JMS Exception occured.  Shutting down client.");
+            LOG.error("Consumer for destination, (" + destinationName + "), JMS Exception occurred.  Shutting down client.");
         }
 
         public synchronized void setStop(boolean bStop) {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
index f896342dcc6..ad9970757d1 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
@@ -83,7 +83,7 @@ public void tearDown() throws Exception {
             tpe.shutdown();
         }
 
-        public void testLoadedSendRecieveWithCorrelationId() throws Exception {
+        public void testLoadedSendReceiveWithCorrelationId() throws Exception {
 
             ActiveMQConnectionFactory connectionFactory = new org.apache.activemq.ActiveMQConnectionFactory();
             connectionFactory.setBrokerURL(connectionUri);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
index 2c865621fa4..16cbcc0335b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
@@ -45,7 +45,7 @@
 import org.apache.log4j.Logger;
 
 /**
- * A AMQ1936Test
+ * AMQ1936Test
  *
  */
 public class AMQ1936Test extends TestCase {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
index f172a919f33..49903ef8f42 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
@@ -340,7 +340,7 @@ public void configure(BrokerService broker) throws Exception {
         int batch = 200;
         long expectedSeq;
 
-        final TimerTask restartTask = schedualRestartTask(null, new Configurer() {
+        final TimerTask restartTask = scheduleRestartTask(null, new Configurer() {
             public void configure(BrokerService broker) throws Exception {
             }
         });
@@ -385,7 +385,7 @@ public void configure(BrokerService broker) throws Exception {
         });
 
         final Timer timer = new Timer();
-        schedualRestartTask(timer, new Configurer() {
+        scheduleRestartTask(timer, new Configurer() {
             public void configure(BrokerService broker) throws Exception {
             }
         });
@@ -408,7 +408,7 @@ public void configure(BrokerService broker) throws Exception {
         });
 
         final Timer timer = new Timer();
-        schedualRestartTask(timer, null);
+        scheduleRestartTask(timer, null);
 
         try {
             verifyOrderedMessageReceipt(ActiveMQDestination.TOPIC_TYPE);
@@ -441,7 +441,7 @@ public void configure(BrokerService broker) throws Exception {
         });
 
         final Timer timer = new Timer();
-        schedualRestartTask(timer, null);
+        scheduleRestartTask(timer, null);
 
         try {
             verifyOrderedMessageReceipt(destinationType, 1, true);
@@ -470,7 +470,7 @@ private void verifyStats(boolean brokerRestarts) throws Exception {
         }
     }
 
-    private TimerTask schedualRestartTask(final Timer timer, final Configurer configurer) {
+    private TimerTask scheduleRestartTask(final Timer timer, final Configurer configurer) {
         class RestartTask extends TimerTask {
             public void run() {
                 synchronized (brokerLock) {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2356Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2356Test.java
index 283dd92b452..fb6169db6c3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2356Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2356Test.java
@@ -37,7 +37,7 @@
 import org.apache.activemq.store.kahadb.KahaDBStore;
 
 /*
- A AMQ2356Test
+ AMQ2356Test
  We have an environment where we have a very large number of destinations.
  In an effort to reduce the number of threads I have set the options
  -Dorg.apache.activemq.UseDedicatedTaskRunner=false
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
index 22ad6abd4cb..0bec2645689 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
@@ -101,7 +101,7 @@ protected void configurePersistence(BrokerService brokerService, boolean recover
         // ensure there are a bunch of data files but multiple entries in each
         adapter.setJournalMaxFileLength(1024 * 20);
 
-        // speed up the test case, checkpoint an cleanup early and often
+        // speed up the test case, checkpoint and cleanup early and often
         adapter.setCheckpointInterval(5000);
         adapter.setCleanupInterval(5000);
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java
index dcd5064c6c3..5f1c3e9f66c 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java
@@ -41,7 +41,7 @@
  * This test involves the creation of a local and remote broker, both of which
  * communicate over VM and TCP. The local broker establishes a bridge to the
  * remote broker for the purposes of verifying that broker info is only
- * transfered once the local broker's ID is known to the bridge support.
+ * transferred once the local broker's ID is known to the bridge support.
  */
 public class AMQ3014Test {
     // Change this URL to be an unused port.
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3120Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3120Test.java
index bfff0fd95f3..f61883b1460 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3120Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3120Test.java
@@ -74,7 +74,7 @@ protected void configurePersistence(BrokerService brokerService, boolean deleteA
         // ensure there are a bunch of data files but multiple entries in each
         adapter.setJournalMaxFileLength(1024 * 20);
 
-        // speed up the test case, checkpoint an cleanup early and often
+        // speed up the test case, checkpoint and cleanup early and often
         adapter.setCheckpointInterval(500);
         adapter.setCleanupInterval(500);
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3674Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3674Test.java
index 47ab75481d9..026bf110d6d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3674Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3674Test.java
@@ -73,7 +73,7 @@ public void removeSubscription() throws Exception {
             brokerView.destroyDurableSubscriber("subscriber1", "myTopic");
             fail("Expected Exception for Durable consumer is in use");
         } catch(Exception e) {
-            LOG.info("Recieved expected exception: " + e.getMessage());
+            LOG.info("Received expected exception: " + e.getMessage());
         }
 
         LOG.info("Current Durable Topic Subscriptions: " + brokerView.getDurableTopicSubscribers().length);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4062Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4062Test.java
index a567455adfa..222efc7a84d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4062Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4062Test.java
@@ -130,7 +130,7 @@ public void stopBroker() throws Exception {
     public void testDirableSubPrefetchRecovered() throws Exception{
 
         PrefetchConsumer consumer=new PrefetchConsumer(true, connectionUri);
-        consumer.recieve();
+        consumer.receive();
         durableSubscriptions=getDurableSubscriptions();
         ConsumerInfo info=getConsumerInfo(durableSubscriptions);
 
@@ -159,7 +159,7 @@ public void testDirableSubPrefetchRecovered() throws Exception{
         //assertEquals(0, info.getPrefetchSize());
 
         consumer=new PrefetchConsumer(false, connectionUri);
-        consumer.recieve();
+        consumer.receive();
         consumer.a.countDown();
 
         info=null;
@@ -213,7 +213,7 @@ public PrefetchConsumer(boolean needAck, String uri){
             this.uri = uri;
         }
 
-        public void recieve() throws Exception{
+        public void receive() throws Exception{
             ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(user, password, uri);
             connection = (ActiveMQConnection)connectionFactory.createConnection();
             connection.setClientID("3");
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4323Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4323Test.java
index 8e6a96fffce..594e92f9256 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4323Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4323Test.java
@@ -78,7 +78,7 @@ protected void configurePersistence(BrokerService brokerService, boolean deleteA
         // ensure there are a bunch of data files but multiple entries in each
         adapter.setJournalMaxFileLength(1024 * 20);
 
-        // speed up the test case, checkpoint an cleanup early and often
+        // speed up the test case, checkpoint and cleanup early and often
         adapter.setCheckpointInterval(500);
         adapter.setCleanupInterval(500);
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4504Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4504Test.java
index 64204bd758b..6041a890f58 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4504Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4504Test.java
@@ -73,7 +73,7 @@ public void testCompositeDestConsumer() throws Exception {
         MessageConsumer consumer = connection.createSession(false, Session.AUTO_ACKNOWLEDGE).createConsumer(activeMQQueue);
         try {
             for (int i=0; i< numMessages * numDests; i++) {
-                assertNotNull("recieved:"  + i, consumer.receive(4000));
+                assertNotNull("received:"  + i, consumer.receive(4000));
             }
         } finally {
             connection.close();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java
index e8d5371139a..5ac2dc0f682 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java
@@ -158,7 +158,7 @@ public boolean isSatisified() throws Exception {
 
         for (;count < 10; count++) {
             assertTrue((m = consumer.receive(messageReceiveTimeout)) != null);
-            LOG.info("Recieved Message (" + count + "):" + m + ", System Memory Usage " + broker.getSystemUsage().getMemoryUsage().getPercentUsage());
+            LOG.info("Received Message (" + count + "):" + m + ", System Memory Usage " + broker.getSystemUsage().getMemoryUsage().getPercentUsage());
             messagesConsumed.incrementAndGet();
         }
         consumer.close();
@@ -172,7 +172,7 @@ public boolean isSatisified() throws Exception {
         consumer = consumerSession.createConsumer(destination);
         for (count = 0;count < toSend*2; count++) {
             assertTrue((m = consumer.receive(messageReceiveTimeout)) != null);
-            LOG.info("Recieved Message (" + count + "):" + m + ", System Memory Usage " + broker.getSystemUsage().getMemoryUsage().getPercentUsage() );
+            LOG.info("Received Message (" + count + "):" + m + ", System Memory Usage " + broker.getSystemUsage().getMemoryUsage().getPercentUsage() );
             messagesConsumed.incrementAndGet();
         }
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageCleanupTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageCleanupTest.java
index e7feb900540..017e070cb3d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageCleanupTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageCleanupTest.java
@@ -113,7 +113,7 @@ public void tearDown() throws Exception {
     public void testIt() throws Exception {
 
         final int startPercentage = broker.getAdminView().getMemoryPercentUsage();
-        LOG.info("MemoryUseage at test start = " + startPercentage);
+        LOG.info("MemoryUsage at test start = " + startPercentage);
 
         for (int i = 0; i < 2; i++) {
             LOG.info("Started the test iteration: " + i + " using queueName = " + queueName);
@@ -144,7 +144,7 @@ public void run() {
             TimeUnit.SECONDS.sleep(2);
         }
 
-        LOG.info("MemoryUseage before awaiting temp store cleanup = " + broker.getAdminView().getMemoryPercentUsage());
+        LOG.info("MemoryUsage before awaiting temp store cleanup = " + broker.getAdminView().getMemoryPercentUsage());
 
         assertTrue("MemoryUsage should return to: " + startPercentage +
                    "% but was " + broker.getAdminView().getMemoryPercentUsage() + "%", Wait.waitFor(new Wait.Condition() {
@@ -156,7 +156,7 @@ public boolean isSatisified() throws Exception {
         }));
 
         int endPercentage = broker.getAdminView().getMemoryPercentUsage();
-        LOG.info("MemoryUseage at test end = " + endPercentage);
+        LOG.info("MemoryUsage at test end = " + endPercentage);
     }
 
     public void destroyQueue() {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/OptimizeAcknowledgeWithExpiredMsgsTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/OptimizeAcknowledgeWithExpiredMsgsTest.java
index 195ccbd030d..43f332b7c6a 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/OptimizeAcknowledgeWithExpiredMsgsTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/OptimizeAcknowledgeWithExpiredMsgsTest.java
@@ -306,7 +306,7 @@ public int getCounter() {
         }
 
         public synchronized void onException(JMSException ex) {
-            LOG.error("JMS Exception occured.  Shutting down client.");
+            LOG.error("JMS Exception occurred.  Shutting down client.");
         }
     }
 }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java
index 066fb07d2be..b78cd777468 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java
@@ -117,7 +117,7 @@ public void run() {
         while ((m = consumer.receive(messageReceiveTimeout)) != null) {
             count++;
             if (count != 0 && count%10 == 0) {
-                LOG.info("Recieved Message (" + count + "):" + m);
+                LOG.info("Received Message (" + count + "):" + m);
             }
             messagesConsumed.incrementAndGet();
             try {
@@ -132,7 +132,7 @@ public void run() {
         while ((m = consumer.receive(messageReceiveTimeout)) != null) {
             count++;
             if (count != 0 && count%100 == 0) {
-                LOG.info("Recieved Message (" + count + "):" + m);
+                LOG.info("Received Message (" + count + "):" + m);
             }
             messagesConsumed.incrementAndGet();
             try {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStoreDataCleanupTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStoreDataCleanupTest.java
index 34df4a3d65b..455f6bab1a4 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStoreDataCleanupTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStoreDataCleanupTest.java
@@ -160,7 +160,7 @@ public boolean isSatisified() throws Exception {
         );
 
         int endPercentage = broker.getAdminView().getMemoryPercentUsage();
-        LOG.info("MemoryUseage at test end = " + endPercentage);
+        LOG.info("MemoryUsage at test end = " + endPercentage);
 
         assertEquals(startPercentage, endPercentage);
     }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java
index 68681c6ed2a..e0b5cd52f52 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java
@@ -177,7 +177,7 @@ private void createLocalBroker() throws Exception {
         ManagementContext managementContext = new ManagementContext();
         managementContext.setCreateConnector(false);
         localBroker.setManagementContext(managementContext);
-        PersistenceAdapter persistenceAdapter = persistanceAdapterFactory("target/local");
+        PersistenceAdapter persistenceAdapter = persistenceAdapterFactory("target/local");
         localBroker.setPersistenceAdapter(persistenceAdapter);
         List transportConnectors = new ArrayList();
         DebugTransportFactory tf = new DebugTransportFactory();
@@ -197,7 +197,7 @@ private void createRemoteBroker() throws Exception {
         ManagementContext managementContext = new ManagementContext();
         managementContext.setCreateConnector(false);
         remoteBroker.setManagementContext(managementContext);
-        PersistenceAdapter persistenceAdapter = persistanceAdapterFactory("target/remote");
+        PersistenceAdapter persistenceAdapter = persistenceAdapterFactory("target/remote");
         remoteBroker.setPersistenceAdapter(persistenceAdapter);
         List networkConnectors = new ArrayList();
         DiscoveryNetworkConnector networkConnector = new DiscoveryNetworkConnector();
@@ -281,15 +281,15 @@ private void stopRemoteBroker() throws Exception {
         remoteBroker.waitUntilStopped();
     }
 
-    private PersistenceAdapter persistanceAdapterFactory(String path) {
+    private PersistenceAdapter persistenceAdapterFactory(String path) {
         if (useLevelDB) {
-            return persistanceAdapterFactory_LevelDB(path);
+            return persistenceAdapterFactory_LevelDB(path);
         } else {
-            return persistanceAdapterFactory_KahaDB(path);
+            return persistenceAdapterFactory_KahaDB(path);
         }
     }
 
-    private PersistenceAdapter persistanceAdapterFactory_KahaDB(String path) {
+    private PersistenceAdapter persistenceAdapterFactory_KahaDB(String path) {
         KahaDBPersistenceAdapter kahaDBPersistenceAdapter = new KahaDBPersistenceAdapter();
         kahaDBPersistenceAdapter.setDirectory(new File(path));
         kahaDBPersistenceAdapter.setIgnoreMissingJournalfiles(true);
@@ -298,7 +298,7 @@ private PersistenceAdapter persistanceAdapterFactory_KahaDB(String path) {
         return kahaDBPersistenceAdapter;
     }
 
-    private PersistenceAdapter persistanceAdapterFactory_LevelDB(String path) {
+    private PersistenceAdapter persistenceAdapterFactory_LevelDB(String path) {
         LevelDBPersistenceAdapter levelDBPersistenceAdapter = new LevelDBPersistenceAdapter();
         levelDBPersistenceAdapter.setDirectory(new File(path));
         return levelDBPersistenceAdapter;
@@ -353,4 +353,4 @@ public void oneway(Object command) throws IOException {
             super.oneway(command);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkFailoverTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkFailoverTest.java
index b16dde00b89..b695b8cf700 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkFailoverTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkFailoverTest.java
@@ -116,7 +116,7 @@ public void onMessage(Message message) {
             }
         });
 
-        // allow for consumer infos to perculate arround
+        // allow for consumer infos to perculate around
         Thread.sleep(2000);
         long done = System.currentTimeMillis() + (MESSAGE_COUNT * 6000);
         int i = 0;
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkLoadTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkLoadTest.java
index 31d2a07941d..17a0f237191 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkLoadTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkLoadTest.java
@@ -57,7 +57,7 @@
  * 
  * If the network bridges gets stuck at any point subsequent queues will not get messages.  This test 
  * samples the production and consumption stats every second and if the flow of messages
- * get stuck then this tast fails.  The test monitors the flow of messages for 1 min.
+ * get stuck then this test fails.  The test monitors the flow of messages for 1 min.
  *  
  * @author chirino
  */
@@ -319,7 +319,7 @@ private String createMessageText(int index) {
 
             // The test is just checking to make sure thaat the producer and consumer does not hang
             // due to the network hops take to route the message form the producer to the consumer.
-            assertTrue("Recieved some messages since last sample", r>0);
+            assertTrue("Received some messages since last sample", r>0);
             assertTrue("Produced some messages since last sample", p>0);
             
         }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
index 62385cbc897..17de21a6628 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
@@ -120,7 +120,7 @@ public void onMessage(Message msg) {
         });
 
         TopicRequestor requestor = new TopicRequestor((TopicSession)localSession, included);
-        // allow for consumer infos to perculate arround
+        // allow for consumer infos to perculate around
         Thread.sleep(5000);
         for (int i = 0; i < MESSAGE_COUNT; i++) {
             TextMessage msg = localSession.createTextMessage("test msg: " + i);
@@ -136,7 +136,7 @@ public void testFiltering() throws Exception {
         MessageConsumer excludedConsumer = remoteSession.createConsumer(excluded);
         MessageProducer includedProducer = localSession.createProducer(included);
         MessageProducer excludedProducer = localSession.createProducer(excluded);
-        // allow for consumer infos to perculate arround
+        // allow for consumer infos to perculate around
         Thread.sleep(2000);
         Message test = localSession.createTextMessage("test");
         includedProducer.send(test);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
index 6f0565891e8..497da3a0741 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
@@ -85,7 +85,7 @@ public void testWriteTimeout() throws Exception {
         Session session = c.createSession(true, Session.SESSION_TRANSACTED);
         MessageConsumer consumer = session.createConsumer(dest);
         proxy.pause();
-        // writes should back up... writeTimeout will kick in a abort the connection
+        // writes should back up... writeTimeout will kick in and abort the connection
         TimeUnit.SECONDS.sleep(10);
         proxy.goOn();
         assertNotNull("can receive buffered messages", consumer.receive(500));
@@ -127,7 +127,7 @@ public void testWriteTimeoutStompNio() throws Exception {
 
         proxy.pause();
 
-        // writes should back up... writeTimeout will kick in a abort the connection
+        // writes should back up... writeTimeout will kick in and abort the connection
         TimeUnit.SECONDS.sleep(1);
 
         // see the blocked threads
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
index 9c08c81e636..c5d39d9bdf2 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
@@ -182,7 +182,7 @@ public void run() {
         broker.start();
 
         assertTrue("consumer added through failover", commitDoneLatch.await(20, TimeUnit.SECONDS));
-        assertTrue("another message was recieved after failover", messagesReceived.await(20, TimeUnit.SECONDS));
+        assertTrue("another message was received after failover", messagesReceived.await(20, TimeUnit.SECONDS));
 
         connection.close();
     }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
index 9b41713d9c7..4270eea7d42 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
@@ -494,7 +494,7 @@ public void testFailoverConnectionSendReplyLost() throws Exception {
             // duplicate checker not updated on canceled tasks, even it
             // it was, recovery of the audit would fail as the message is
             // not recorded in the store and the audit may not be up to date.
-            // So if duplicate messages are a absolute no no after restarts,
+            // So if duplicate messages are an absolute no no after restarts,
             // ConcurrentStoreAndDispatchQueues must be disabled
             ((KahaDBPersistenceAdapter) store).setConcurrentStoreAndDispatchQueues(false);
         }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
index 919c5daf215..05acaf46c13 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
@@ -216,7 +216,7 @@ public void testNoClientHang() throws Exception {
     }
 
     /**
-     * Used to test when a operation blocks. This should not cause transport to
+     * Used to test when an operation blocks. This should not cause transport to
      * get disconnected.
      *
      * @throws Exception
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java
index 70cfa0ea71b..998c951cea3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java
@@ -47,7 +47,7 @@ public class WireformatNegociationTest extends CombinationTestSupport {
     private final AtomicReference asyncError = new AtomicReference();
     private final AtomicBoolean ignoreAsycError = new AtomicBoolean();
 
-    private final CountDownLatch negociationCounter = new CountDownLatch(2);
+    private final CountDownLatch negotiationCounter = new CountDownLatch(2);
 
     protected void setUp() throws Exception {
         super.setUp();
@@ -63,7 +63,7 @@ private void startClient(String uri) throws Exception, URISyntaxException {
             public void onCommand(Object command) {
                 if (command instanceof WireFormatInfo) {
                     clientWF.set((WireFormatInfo)command);
-                    negociationCounter.countDown();
+                    negotiationCounter.countDown();
                 }
             }
 
@@ -71,7 +71,7 @@ public void onException(IOException error) {
                 if (!ignoreAsycError.get()) {
                     LOG.info("Client transport error: ", error);
                     asyncError.set(error);
-                    negociationCounter.countDown();
+                    negotiationCounter.countDown();
                 }
             }
 
@@ -100,7 +100,7 @@ public void onAccept(Transport transport) {
                         public void onCommand(Object command) {
                             if (command instanceof WireFormatInfo) {
                                 serverWF.set((WireFormatInfo)command);
-                                negociationCounter.countDown();
+                                negotiationCounter.countDown();
                             }
                         }
 
@@ -108,7 +108,7 @@ public void onException(IOException error) {
                             if (!ignoreAsycError.get()) {
                                 LOG.info("Server transport error: ", error);
                                 asyncError.set(error);
-                                negociationCounter.countDown();
+                                negotiationCounter.countDown();
                             }
                         }
 
@@ -157,7 +157,7 @@ public void testWireFormatInfoSeverVersion1() throws Exception {
         startServer("tcp://localhost:61616?wireFormat.version=1");
         startClient("tcp://localhost:61616");
 
-        assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
+        assertTrue("Connect timeout", negotiationCounter.await(10, TimeUnit.SECONDS));
         assertNull("Async error: " + asyncError, asyncError.get());
 
         assertNotNull(clientWF.get());
@@ -175,7 +175,7 @@ public void testWireFormatInfoClientVersion1() throws Exception {
         startServer("tcp://localhost:61616");
         startClient("tcp://localhost:61616?wireFormat.version=1");
 
-        assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
+        assertTrue("Connect timeout", negotiationCounter.await(10, TimeUnit.SECONDS));
         assertNull("Async error: " + asyncError, asyncError.get());
 
         assertNotNull(clientWF.get());
@@ -193,7 +193,7 @@ public void testWireFormatInfoCurrentVersion() throws Exception {
         startServer("tcp://localhost:61616");
         startClient("tcp://localhost:61616");
 
-        assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
+        assertTrue("Connect timeout", negotiationCounter.await(10, TimeUnit.SECONDS));
         assertNull("Async error: " + asyncError, asyncError.get());
 
         assertNotNull(clientWF.get());
@@ -208,7 +208,7 @@ public void testWireFormatInactivityDurationInitialDelay() throws Exception {
         startServer("tcp://localhost:61616");
         startClient("tcp://localhost:61616?wireFormat.maxInactivityDurationInitalDelay=60000");
 
-        assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
+        assertTrue("Connect timeout", negotiationCounter.await(10, TimeUnit.SECONDS));
         assertNull("Async error: " + asyncError, asyncError.get());
 
         assertNotNull(clientWF.get());
@@ -223,7 +223,7 @@ public void testWireFormatMaxFrameSize() throws Exception {
         startServer("tcp://localhost:61616");
         startClient("tcp://localhost:61616?wireFormat.maxFrameSize=1048576");
 
-        assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
+        assertTrue("Connect timeout", negotiationCounter.await(10, TimeUnit.SECONDS));
         assertNull("Async error: " + asyncError, asyncError.get());
 
         assertNotNull(clientWF.get());
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
index 7defe954ce5..02e19b7c8ef 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
@@ -110,7 +110,7 @@ protected void assertSendTextMessage(ActiveMQDestination destination, String tex
             producer.oneway(new ProducerInfo());
 
             Command received = assertCommandReceived();
-            assertTrue("Should have received a ActiveMQTextMessage but was: " + received, received instanceof ActiveMQTextMessage);
+            assertTrue("Should have received an ActiveMQTextMessage but was: " + received, received instanceof ActiveMQTextMessage);
             ActiveMQTextMessage actual = (ActiveMQTextMessage)received;
 
             assertEquals("getDestination", expected.getDestination(), actual.getDestination());
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
index e32a1bc80c7..5841b2b1b50 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/BrokerQueueNetworkWithDisconnectTest.java
@@ -82,7 +82,7 @@ public void testSendOnAReceiveOnBWithTransportDisconnect() throws Exception {
         msgs.waitForMessagesToArrive(MESSAGE_COUNT);
 
         assertTrue("At least message " + MESSAGE_COUNT +
-                " must be recieved, duplicates are expected, count=" + msgs.getMessageCount(),
+                " must be received, duplicates are expected, count=" + msgs.getMessageCount(),
                 MESSAGE_COUNT <= msgs.getMessageCount());
     }
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
index 438e2643ed0..aeda7c2d824 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
@@ -493,7 +493,7 @@ public void run() {
                     }
                 }
 
-                // 50% unsubscribe, 50% abondon subscription
+                // 50% unsubscribe, 50% abandon subscription
                 if (!ALLOW_SUBSCRIPTION_ABANDONMENT) {
                     unsubscribe();
                     ALLOW_SUBSCRIPTION_ABANDONMENT = true;
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
index b610f8c530f..6e419490e7a 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
@@ -417,7 +417,7 @@ public void testDurableSubWorksInNewSession() throws JMSException {
         Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         Topic topic = session.createTopic("topic-" + getName());
         MessageConsumer consumer = session.createDurableSubscriber(topic, "sub1");
-        // Drain any messages that may allready be in the sub
+        // Drain any messages that may already be in the sub
         while (consumer.receive(1000) != null) {
         }
 
@@ -443,7 +443,7 @@ public void testDurableSubWorksInNewConnection() throws Exception {
         Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         Topic topic = session.createTopic("topic-" + getName());
         MessageConsumer consumer = session.createDurableSubscriber(topic, "sub1");
-        // Drain any messages that may allready be in the sub
+        // Drain any messages that may already be in the sub
         while (consumer.receive(1000) != null) {
         }
 
@@ -473,7 +473,7 @@ public void testIndividualAckWithDurableSubs() throws Exception {
         Session session = connection.createSession(false, ActiveMQSession.INDIVIDUAL_ACKNOWLEDGE);
         Topic topic = session.createTopic("topic-" + getName());
         MessageConsumer consumer = session.createDurableSubscriber(topic, "sub1");
-        // Drain any messages that may allready be in the sub
+        // Drain any messages that may already be in the sub
         while (consumer.receive(1000) != null) {
         }
         consumer.close();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.java
index e911d0c3489..6b61438102d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.java
@@ -67,7 +67,7 @@ public void testSendOnAFaultyTransport() throws Exception {
         msgs.waitForMessagesToArrive(MESSAGE_COUNT);
 
         assertTrue("At least message " + MESSAGE_COUNT + 
-                " must be recieved, duplicates are expected, count=" + msgs.getMessageCount(),
+                " must be received, duplicates are expected, count=" + msgs.getMessageCount(),
                 MESSAGE_COUNT <= msgs.getMessageCount());
     }
 
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
index 6d28f3483b0..046818a5e3f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
@@ -267,10 +267,10 @@ class TopicWithDuplicateMessages {
 
         private final List receivedStrings = Collections.synchronizedList(new ArrayList());
         private int numMessages = 10;
-        private CountDownLatch recievedLatch = new CountDownLatch(numMessages);
+        private CountDownLatch receivedLatch = new CountDownLatch(numMessages);
 
         public CountDownLatch getLatch() {
-            return recievedLatch;
+            return receivedLatch;
         }
         
         public List getMessageStrings() {
@@ -324,7 +324,7 @@ public void onMessage(Message arg0) {
                     try {
                         LOG.debug("Received message [" + msg.getText() + "]");
                         receivedStrings.add(msg.getText());
-                        recievedLatch.countDown();
+                        receivedLatch.countDown();
                     } catch (JMSException e) {
                         fail("Unexpected :" + e);
                     }
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java
index 99deb288433..70d3563232b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java
@@ -105,7 +105,7 @@ public void testABandBCbrokerNetworkWithSelectors() throws Exception {
         MessageConsumer clientB = createConsumer("BrokerC", dest, "dummy > 30");
         MessageConsumer clientC = createConsumer("BrokerC", dest, "dummy = 34");
 
-        // let consumers propogate around the network
+        // let consumers propagate around the network
         Thread.sleep(2000);
         // Send messages
         // Send messages for broker A
@@ -229,7 +229,7 @@ public void testAllConnectedBrokerNetwork() throws Exception {
         MessageConsumer clientA = createConsumer("BrokerA", dest);
         MessageConsumer clientB = createConsumer("BrokerB", dest);
         MessageConsumer clientC = createConsumer("BrokerC", dest);
-        //let consumers propogate around the network
+        //let consumers propagate around the network
         Thread.sleep(2000);
 
         // Send messages
@@ -285,7 +285,7 @@ public void testAllConnectedBrokerNetworkSingleProducerTTL() throws Exception {
         MessageConsumer clientA = createConsumer("BrokerA", dest);
         MessageConsumer clientB = createConsumer("BrokerB", dest);
         MessageConsumer clientC = createConsumer("BrokerC", dest);
-        //let consumers propogate around the network
+        //let consumers propagate around the network
         Thread.sleep(2000);
 
         // Send messages
@@ -328,7 +328,7 @@ public void testAllConnectedBrokerNetworkDurableSubTTL() throws Exception {
         MessageConsumer clientA = createDurableSubscriber("BrokerA", (Topic)dest, "clientA");
         MessageConsumer clientB = createDurableSubscriber("BrokerB", (Topic)dest, "clientB");
         MessageConsumer clientC = createDurableSubscriber("BrokerC", (Topic)dest, "clientC");
-        //let consumers propogate around the network
+        //let consumers propagate around the network
         Thread.sleep(2000);
 
         // Send messages
@@ -368,7 +368,7 @@ public void testAllConnectedUsingMulticast() throws Exception {
         MessageConsumer clientB = createConsumer("BrokerB", dest);
         MessageConsumer clientC = createConsumer("BrokerC", dest);
 
-        //let consumers propogate around the network
+        //let consumers propagate around the network
         Thread.sleep(2000);
 
         // Send messages
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicReplicationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicReplicationTest.java
index 354f8af7fc1..e01616e8712 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicReplicationTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TopicReplicationTest.java
@@ -46,7 +46,7 @@ public void testReplication() throws Exception {
         MessageConsumer clientC = createConsumer("replication-broker4", dest);
         MessageConsumer clientD = createConsumer("replication-broker4", dest);
 
-        //let consumers propogate around the network
+        //let consumers propagate around the network
         Thread.sleep(2000);
 
         // Get message count
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java
index 0dc9e61e54c..a53cc08ea96 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerVirtualTopicForwardingTest.java
@@ -49,7 +49,7 @@ public void testBridgeVirtualTopicQueues() throws Exception {
         MessageConsumer clientB = createConsumer("BrokerB", createDestination("Consumer.B.VirtualTopic.tempTopic", false));
 
 
-        // give a sec to let advisories propogate
+        // give a sec to let advisories propagate
         Thread.sleep(500);
 
         ActiveMQQueue queueA = new ActiveMQQueue("Consumer.A.VirtualTopic.tempTopic");
@@ -91,7 +91,7 @@ public void testDontBridgeQueuesWithOnlyQueueConsumers() throws Exception{
         MessageConsumer clientB = createConsumer("BrokerB", createDestination("Consumer.B.VirtualTopic.tempTopic", false));
 
 
-        // give a sec to let advisories propogate
+        // give a sec to let advisories propagate
         Thread.sleep(500);
 
         ActiveMQQueue queueA = new ActiveMQQueue("Consumer.A.VirtualTopic.tempTopic");
@@ -133,7 +133,7 @@ public void testDontBridgeQueuesWithBothTypesConsumers() throws Exception{
         MessageConsumer clientC = createConsumer("BrokerB", createDestination("VirtualTopic.tempTopic", true));
 
 
-        // give a sec to let advisories propogate
+        // give a sec to let advisories propagate
         Thread.sleep(500);
 
         ActiveMQQueue queueA = new ActiveMQQueue("Consumer.A.VirtualTopic.tempTopic");
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java
index 19361121fe6..bd724a98417 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java
@@ -45,7 +45,7 @@ public class ManagementContextXBeanConfigTest extends TestCase {
     protected BrokerService brokerService;
     private static final transient Logger LOG = LoggerFactory.getLogger(ManagementContextXBeanConfigTest.class);
 
-    public void testManagmentContextConfiguredCorrectly() throws Exception {
+    public void testManagementContextConfiguredCorrectly() throws Exception {
         assertEquals(2011, brokerService.getManagementContext().getConnectorPort());
         assertEquals("test.domain", brokerService.getManagementContext().getJmxDomainName());
         // Make sure the broker is registered in the right jmx domain.
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
index 347fbdced4f..37ffcee5feb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutogroupIdTest.java
@@ -165,7 +165,7 @@ public void testGroupIdAutomaticallySetMultipleProducers() throws Exception
    }
 
    /*
-   * tests that even tho we have an grouping round robin distributor we don't pin the consumer as autogroup is false
+   * tests that even though we have a grouping round robin distributor we don't pin the consumer as autogroup is false
    * */
    @Test
    public void testGroupIdAutomaticallyNotSet() throws Exception
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
index e137d360c4c..18d683ff217 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
@@ -107,7 +107,7 @@ public void testMessageExpiredWithoutExpiryAddressWithExpiryDelayOverride() thro
       // stopping the consumer to cleanup the client's buffer
       session.stop();
 
-      // we recieve the message and then rollback...   then we wait some time > expiration, the message must be gone
+      // we receive the message and then rollback...   then we wait some time > expiration, the message must be gone
       session.rollback();
 
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
index 8f73f65d1ba..575518b4f5a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
@@ -33,7 +33,7 @@
 import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
 
 /**
- * A test that makes sure that a ActiveMQ Artemis server cleans up the associated
+ * A test that makes sure that an ActiveMQ Artemis server cleans up the associated
  * resources when one of its client crashes.
  */
 public class ClientCrashTest extends ClientTestBase
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
index a4f9fa9068c..cc497972521 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
@@ -29,7 +29,7 @@
 import org.junit.Test;
 
 /**
- * A test that makes sure that a ActiveMQ Artemis client gracefully exists after the last session is
+ * A test that makes sure that an ActiveMQ Artemis client gracefully exists after the last session is
  * closed. Test for http://jira.jboss.org/jira/browse/JBMESSAGING-417.
  *
  * This is not technically a crash test, but it uses the same type of topology as the crash tests
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
index 17e8a866f8a..0838877d497 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
@@ -1791,7 +1791,7 @@ public void testClusterAddressCreatesBindingsForSimpleStringAddressFilters() thr
 
    @Test
    /**
-    * This test verifies that an string exclude filter '!jms.eu.uk' results in bindings not being created for this
+    * This test verifies that a string exclude filter '!jms.eu.uk' results in bindings not being created for this
     * address for nodes in a cluster.  But ensures that other addresses are matched and bindings created.
     */
    public void testClusterAddressDoesNotCreatesBindingsForStringExcludesAddressFilters() throws Exception
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
index 99e73559ee7..b0ee92f1083 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
@@ -352,7 +352,7 @@ private void doTestNonTransactional(final TestRunner runner) throws Exception
             {
                if (counterGap)
                {
-                  Assert.fail("got a another counter gap at " + count + ": " + counts);
+                  Assert.fail("got another counter gap at " + count + ": " + counts);
                }
                else
                {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
index 58ffa6d1a5c..bafa19cb0a5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
@@ -48,7 +48,7 @@
 
 /**
  *
- * A ActiveMQConnectionFactoryTest
+ * ActiveMQConnectionFactoryTest
  */
 public class ActiveMQConnectionFactoryTest extends ActiveMQTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
index 43542346a43..d5f45ebdbcc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
@@ -54,7 +54,7 @@
 
 /**
  *
- * A ActiveMQConnectionFactoryTest
+ * ActiveMQConnectionFactoryTest
  */
 public class SimpleJNDIClientTest extends ActiveMQTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java
index e8058d864f4..45e40116a5d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ExceptionListenerTest.java
@@ -43,7 +43,7 @@
 
 /**
  *
- * A ExceptionListenerTest
+ * ExceptionListenerTest
  */
 public class ExceptionListenerTest extends ActiveMQTestBase
 {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
index 9cca7b3d61c..a8afa8cbe41 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
@@ -56,7 +56,7 @@ public void setUp() throws Exception
 
 
    @Test
-   public void sendToNonExistantDestination() throws Exception
+   public void sendToNonExistentDestination() throws Exception
    {
       Destination destination = ActiveMQJMSClient.createTopic("DoesNotExist");
       TransportConfiguration transportConfiguration = new TransportConfiguration(InVMConnectorFactory.class.getName());
@@ -69,7 +69,7 @@ public void sendToNonExistantDestination() throws Exception
       {
          MessageProducer messageProducer = session.createProducer(null);
          messageProducer.send(destination, session.createMessage());
-         Assert.fail("Succeeded in sending message to a non-existant destination using JMS 1 API!");
+         Assert.fail("Succeeded in sending message to a non-existent destination using JMS 1 API!");
       }
       catch (JMSException e)
       { // Expected }
@@ -83,7 +83,7 @@ public void sendToNonExistantDestination() throws Exception
       try
       {
          jmsProducer.send(destination, context.createMessage());
-         Assert.fail("Succeeded in sending message to a non-existant destination using JMS 2 API!");
+         Assert.fail("Succeeded in sending message to a non-existent destination using JMS 2 API!");
       }
       catch (JMSRuntimeException e)
       { // Expected }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer11Test.java
index 07b4911e5a7..4550fcc0292 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer11Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer11Test.java
@@ -90,14 +90,14 @@ public void testPrefetch1MessageNotDispatched() throws Exception
       System.out.println("received2: " + message2);
       assertNotNull(message2);
 
-      System.out.println("commitning sessions !! " + session.getClass().getName());
+      System.out.println("committing sessions !! " + session.getClass().getName());
       session.commit();
-      System.out.println("commited session, now 2");
+      System.out.println("committed session, now 2");
       session2.commit();
 
-      System.out.println("all commited");
+      System.out.println("all committed");
       Message m = consumer.receiveNoWait();
-      System.out.println("recieved 3: " + m);
+      System.out.println("received 3: " + m);
       assertNull(m);
 
       try
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java
index 2b131c550b4..c9042d1159c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java
@@ -69,13 +69,13 @@ protected void extraServerConfig(Configuration serverConfig)
    }
 
    @Override
-   public void test2ndPubisherWithStandardConnectionThatIsBlocked() throws Exception
+   public void test2ndPublisherWithStandardConnectionThatIsBlocked() throws Exception
    {
       // with sendFailIfNoSpace set, there is no blocking of the connection
    }
 
    @Override
-   public void testAsyncPubisherRecoverAfterBlock() throws Exception
+   public void testAsyncPublisherRecoverAfterBlock() throws Exception
    {
       // sendFail means no flowControllwindow as there is no producer ack, just
       // an exception
@@ -83,7 +83,7 @@ public void testAsyncPubisherRecoverAfterBlock() throws Exception
 
    @Override
    @Test
-   public void testPubisherRecoverAfterBlock() throws Exception
+   public void testPublisherRecoverAfterBlock() throws Exception
    {
       ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory) getConnectionFactory();
       // with sendFail, there must be no flowControllwindow
@@ -145,7 +145,7 @@ public void run()
    }
 
    @Test
-   public void testPubisherRecoverAfterBlockWithSyncSend() throws Exception
+   public void testPublisherRecoverAfterBlockWithSyncSend() throws Exception
    {
       ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory) getConnectionFactory();
       factory.setExceptionListener(null);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java
index a30cf20c398..e658a1d5e7d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java
@@ -52,7 +52,7 @@ public class ProducerFlowControlTest extends BasicOpenWireTest
    private Thread asyncThread = null;
 
    @Test
-   public void test2ndPubisherWithProducerWindowSendConnectionThatIsBlocked() throws Exception
+   public void test2ndPublisherWithProducerWindowSendConnectionThatIsBlocked() throws Exception
    {
       factory.setProducerWindowSize(1024 * 64);
       flowControlConnection = (ActiveMQConnection) factory.createConnection();
@@ -85,7 +85,7 @@ public void test2ndPubisherWithProducerWindowSendConnectionThatIsBlocked() throw
    }
 
    @Test
-   public void testPubisherRecoverAfterBlock() throws Exception
+   public void testPublisherRecoverAfterBlock() throws Exception
    {
       flowControlConnection = (ActiveMQConnection) factory.createConnection();
       flowControlConnection.start();
@@ -139,7 +139,7 @@ public void run()
    }
 
    @Test
-   public void testAsyncPubisherRecoverAfterBlock() throws Exception
+   public void testAsyncPublisherRecoverAfterBlock() throws Exception
    {
       factory.setProducerWindowSize(1024 * 5);
       factory.setUseAsyncSend(true);
@@ -195,7 +195,7 @@ public void run()
    }
 
    @Test
-   public void test2ndPubisherWithSyncSendConnectionThatIsBlocked() throws Exception
+   public void test2ndPublisherWithSyncSendConnectionThatIsBlocked() throws Exception
    {
       factory.setAlwaysSyncSend(true);
       flowControlConnection = (ActiveMQConnection) factory.createConnection();
@@ -255,7 +255,7 @@ public void testSimpleSendReceive() throws Exception
    }
 
    @Test
-   public void test2ndPubisherWithStandardConnectionThatIsBlocked() throws Exception
+   public void test2ndPublisherWithStandardConnectionThatIsBlocked() throws Exception
    {
       flowControlConnection = (ActiveMQConnection) factory.createConnection();
       flowControlConnection.start();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TimeStampTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TimeStampTest.java
index 01561bebe64..8daa6f440f8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TimeStampTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/TimeStampTest.java
@@ -79,7 +79,7 @@ public void testTimestamp() throws Exception
 
       // assert message timestamp is unchanged
       assertEquals(
-            "JMS Message Timestamp of recieved message should be the same as the sent message\n        ",
+            "JMS Message Timestamp of received message should be the same as the sent message\n        ",
             sentMessage.getJMSTimestamp(), receivedMessage.getJMSTimestamp());
 
       // Clean up
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java
index ff9ae4061e8..13ea5bce367 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingWithFailoverAndCountersTest.java
@@ -238,7 +238,7 @@ public void run()
                      currentMsg = msg.getLongProperty("count");
                      if (currentMsg < lastCommit)
                      {
-                        failed("Message recieved in duplicate out of order, LastCommit = " + lastCommit + ", currentMsg = " + currentMsg);
+                        failed("Message received in duplicate out of order, LastCommit = " + lastCommit + ", currentMsg = " + currentMsg);
                      }
                      msg.acknowledge();
                      if (txSize > 0 && msgcount > 0 && (msgcount % txSize == 0))
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
index e73f935ad89..2111baf8ca1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
@@ -278,7 +278,7 @@ public void run() throws Throwable
 
       // There is a bug on the qpid client library currently, we can expect having to interrupt the thread on browsers.
       // but we can't have it on 10 iterations... something must be broken if that's the case
-      Assert.assertTrue("Test had to interrupt on all ocasions.. this is beyond the expected for the test", success);
+      Assert.assertTrue("Test had to interrupt on all occasions.. this is beyond the expected for the test", success);
    }
 
    @Test
@@ -886,7 +886,7 @@ public void testUsingPlainAMQP() throws Exception
 
 
    @Test
-   public void testUsingPlainAMQPSenderWithNonExistantQueue() throws Exception
+   public void testUsingPlainAMQPSenderWithNonExistentQueue() throws Exception
    {
       if (this.protocol != 0 && protocol != 3)
       {
@@ -938,7 +938,7 @@ public void testUsingPlainAMQPSenderWithNonExistantQueue() throws Exception
 
 
    @Test
-   public void testUsingPlainAMQPReceiverWithNonExistantQueue() throws Exception
+   public void testUsingPlainAMQPReceiverWithNonExistentQueue() throws Exception
    {
       if (this.protocol != 0 && protocol != 3)
       {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
index 541e8153fd8..64a63cb4760 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
@@ -154,19 +154,19 @@ public void testSendMessage() throws Exception
    @Test
    public void testSendMessageToNonExistentQueue() throws Exception
    {
-      String nonExistantQueue = RandomUtil.randomString();
+      String nonExistentQueue = RandomUtil.randomString();
       String frame = "CONNECT\n" + "login: brianm\n" + "passcode: wombats\n\n" + Stomp.NULL;
       sendFrame(frame);
 
       frame = receiveFrame(10000);
       Assert.assertTrue(frame.startsWith("CONNECTED"));
 
-      frame = "SEND\n" + "destination:" + getQueuePrefix() + nonExistantQueue + "\n\n" + "Hello World" + Stomp.NULL;
+      frame = "SEND\n" + "destination:" + getQueuePrefix() + nonExistentQueue + "\n\n" + "Hello World" + Stomp.NULL;
 
       sendFrame(frame);
       receiveFrame(1000);
 
-      MessageConsumer consumer = session.createConsumer(ActiveMQJMSClient.createQueue(nonExistantQueue));
+      MessageConsumer consumer = session.createConsumer(ActiveMQJMSClient.createQueue(nonExistentQueue));
       TextMessage message = (TextMessage) consumer.receive(1000);
       Assert.assertNotNull(message);
       Assert.assertEquals("Hello World", message.getText());
@@ -180,9 +180,9 @@ public void testSendMessageToNonExistentQueue() throws Exception
       Assert.assertTrue(Math.abs(tnow - tmsg) < 1500);
 
       // closing the consumer here should trigger auto-deletion
-      assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistantQueue)));
+      assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistentQueue)));
       consumer.close();
-      assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistantQueue)));
+      assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistentQueue)));
    }
 
    /*
@@ -1133,9 +1133,9 @@ public void testSubscribeToTopic() throws Exception
    }
 
    @Test
-   public void testSubscribeToNonExistantQueue() throws Exception
+   public void testSubscribeToNonExistentQueue() throws Exception
    {
-      String nonExistantQueue = RandomUtil.randomString();
+      String nonExistentQueue = RandomUtil.randomString();
 
       String frame = "CONNECT\n" + "login: brianm\n" + "passcode: wombats\n\n" + Stomp.NULL;
       sendFrame(frame);
@@ -1145,7 +1145,7 @@ public void testSubscribeToNonExistantQueue() throws Exception
 
       frame = "SUBSCRIBE\n" + "destination:" +
          getQueuePrefix() +
-         nonExistantQueue +
+         nonExistentQueue +
          "\n" +
          "receipt: 12\n" +
          "\n\n" +
@@ -1155,18 +1155,18 @@ public void testSubscribeToNonExistantQueue() throws Exception
       frame = receiveFrame(10000);
       Assert.assertTrue(frame.startsWith("RECEIPT"));
 
-      sendMessage(getName(), ActiveMQJMSClient.createQueue(nonExistantQueue));
+      sendMessage(getName(), ActiveMQJMSClient.createQueue(nonExistentQueue));
 
       frame = receiveFrame(10000);
       Assert.assertTrue(frame.startsWith("MESSAGE"));
       Assert.assertTrue(frame.indexOf("destination:") > 0);
       Assert.assertTrue(frame.indexOf(getName()) > 0);
 
-      assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistantQueue)));
+      assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistentQueue)));
 
       frame = "UNSUBSCRIBE\n" + "destination:" +
          getQueuePrefix() +
-         nonExistantQueue +
+         nonExistentQueue +
          "\n" +
          "receipt: 1234\n" +
          "\n\n" +
@@ -1176,9 +1176,9 @@ public void testSubscribeToNonExistantQueue() throws Exception
       frame = receiveFrame(10000);
       Assert.assertTrue(frame.startsWith("RECEIPT"));
 
-      assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistantQueue)));
+      assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistentQueue)));
 
-      sendMessage(getName(), ActiveMQJMSClient.createQueue(nonExistantQueue));
+      sendMessage(getName(), ActiveMQJMSClient.createQueue(nonExistentQueue));
 
       frame = receiveFrame(1000);
       log.info("Received frame: " + frame);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java
index 99702425c10..d5c94a5bcaf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/vertx/ActiveMQVertxUnitTest.java
@@ -282,7 +282,7 @@ public void testIncomingEvents() throws Exception
       Float recvFloat = msg.getBodyBuffer().readFloat();
       assertEquals(aFloat, recvFloat);
 
-      //send a Integer
+      //send an Integer
       Integer aInt = new Integer(1234);
       vertx.eventBus().send(incomingVertxAddress1, aInt);
       msg = receiveFromQueue(incomingQueue1);
@@ -456,7 +456,7 @@ public void testOutgoingEvents() throws Exception
 
       handler.checkFloatMessageReceived(aFloat);
 
-      //send a Integer
+      //send an Integer
       Integer aInt = new Integer(1234);
       vertx.eventBus().send(incomingVertxAddress2, aInt);
 
@@ -597,7 +597,7 @@ public void testOutgoingEvents2() throws Exception
       handler1.checkFloatMessageReceived(aFloat);
       handler2.checkFloatMessageReceived(aFloat);
 
-      //send a Integer
+      //send an Integer
       Integer aInt = new Integer(1234);
       vertx.eventBus().send(incomingVertxAddress3, aInt);
 
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
index b9894c98f93..1a3e48f5d22 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
@@ -116,7 +116,7 @@ public void testSetClientAfterStart() throws Exception
          // we startthe connection
          connection.start();
 
-         // an attempt to set the client ID now should throw a IllegalStateException
+         // an attempt to set the client ID now should throw an IllegalStateException
          connection.setClientID("testSetClientID_2");
          ProxyAssertSupport.fail("Should throw a javax.jms.IllegalStateException");
       }
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
index 1156e8f7c54..273f2eb0f0d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
@@ -281,7 +281,7 @@ public void run()
             }
             catch (Throwable t)
             {
-               log.trace("receive() exits with an throwable", t);
+               log.trace("receive() exits with a throwable", t);
                ProxyAssertSupport.fail();
             }
             finally
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
index 179a7b56836..5ce252785fd 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
@@ -223,7 +223,7 @@ else if (corrIDString != null)
          }
          catch (JMSException e)
          {
-            // not a int
+            // not an int
          }
 
          if (found)
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
index eda6b7f53f2..9cb40de6240 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
@@ -32,7 +32,7 @@
 
 /**
  *
- * A ObjectMessageDeliveryTest
+ * ObjectMessageDeliveryTest
  */
 public class ObjectMessageDeliveryTest extends ActiveMQServerTestCase
 {
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/SpawnedJMSServer.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/SpawnedJMSServer.java
index e8a03e3249c..583cb82867a 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/SpawnedJMSServer.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/SpawnedJMSServer.java
@@ -73,7 +73,7 @@ public static void main(final String[] args) throws Exception
             }
             else
             {
-               // stop anyway but with a error status
+               // stop anyway but with an error status
                System.exit(1);
             }
          }
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java
index de40a63b238..f9461e68b3e 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java
@@ -57,7 +57,7 @@ public void testSetClientID_1()
          // now the connection has a client ID (either "testSetClientID_1" or one set by the provider
          Assert.assertTrue(subscriberConnection.getClientID() != null);
 
-         // a attempt to set a client ID should now throw an IllegalStateException
+         // an attempt to set a client ID should now throw an IllegalStateException
          subscriberConnection.setClientID("another client ID");
          Assert.fail("Should raise a javax.jms.IllegalStateException");
       }
@@ -100,7 +100,7 @@ public void testSetClientID_2()
          // we start the connection
          subscriberConnection.start();
 
-         // an attempt to set the client ID now should throw a IllegalStateException
+         // an attempt to set the client ID now should throw an IllegalStateException
          subscriberConnection.setClientID("testSetClientID_2");
          Assert.fail("Should throw a javax.jms.IllegalStateException");
       }
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
index 390f17d5115..a2ebd6c6c2e 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java
@@ -359,7 +359,7 @@ private void simulateRead(ActiveMQBuffer buf)
       buf.setIndex(buf.capacity() / 2, buf.capacity() / 2);
 
       // ok this is not actually happening during the read process, but changing this shouldn't affect the buffer on copy
-      // this is to exagerate the isolation on this test
+      // this is to exaggerate the isolation on this test
       buf.writeBytes(new byte[1024]);
    }