Spelling fixes

artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java

@@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
 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.
  * <p>
  * Instances of it can be obtained from {@link ActiveMQBuffers} factory.
  * <p>

artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffers.java

@@ -53,12 +53,12 @@ public final class ActiveMQBuffers
    }
 
    /**
-    * 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 final class ActiveMQBuffers
    }
 
    /**
-    * 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)
    {

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

artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java

@@ -141,7 +141,7 @@ public final class UUIDGenerator
     * 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()
    {

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java

@@ -386,7 +386,7 @@ public final class ActiveMQDefaultConfiguration
    // 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 final class ActiveMQDefaultConfiguration
    }
 
    /**
-    * 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()
    {

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.
     * <br>
     * 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 <em>copy</em> of the message body as a ActiveMQBuffer. Any modification
+    * Returns a <em>copy</em> 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

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
     */

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java

@@ -46,7 +46,7 @@ public interface ClientConsumer extends AutoCloseable
     * <p>
     * This call will block indefinitely until a message is received.
     * <p>
-    * 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
     * <p>
     * This call will block until a message is received or the given timeout expires.
     * <p>
-    * 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.
     * <p>
-    * 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.
     * <p>
-    * 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
     */

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java

@@ -586,7 +586,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * 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;

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java

@@ -25,7 +25,7 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
  * A ClientSessionFactory is the entry point to create and configure ActiveMQ Artemis resources to produce and consume messages.
  * <br>
  * 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
 {

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java

@@ -19,7 +19,7 @@ package org.apache.activemq.artemis.api.core.client;
 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.
  * <p>
  * If the session is not blocking when sending durable or non-durable messages, the session can set

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
 {

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java

@@ -19,7 +19,7 @@ package org.apache.activemq.artemis.api.core.management;
 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
 {

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java

@@ -99,7 +99,7 @@ public final class ManagementHelper
    }
 
    /**
-    * 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 final class ManagementHelper
    }
 
    /**
-    * 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

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)

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)

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 final class ClientConsumerImpl implements ClientConsumerInternal
    // ---------------------------------------------------------------------------------------
 
    /**
-    * Sending a initial credit for slow consumers
+    * Sending an initial credit for slow consumers
     */
    private void startSlowConsumer()
    {

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java

@@ -591,7 +591,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
          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
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java

@@ -22,8 +22,8 @@ import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;
 
 /**
- * An InflaterReader
+ * InflaterReader
- * It takes an compressed input stream and decompressed it as it is being read.
+ * It takes a compressed input stream and decompressed it as it is being read.
  * Not for concurrent use.
  */
 public class InflaterReader extends InputStream

artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterWriter.java

@@ -22,7 +22,7 @@ import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;
 
 /**
- * A InflaterWriter
+ * InflaterWriter
  * <p>
  * This class takes an OutputStream. Compressed bytes
  * can directly be written into this class. The class will

artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONArray.java

@@ -686,7 +686,7 @@ public class JSONArray
    }
 
    /**
-    * 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 class JSONArray
    }
 
    /**
-    * 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.

artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONObject.java

@@ -1385,7 +1385,7 @@ public class JSONObject
    }
 
    /**
-    * 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.
     */

artemis-distribution/src/main/resources/README.html

@@ -58,7 +58,7 @@ y
 
 </PRE>
 
-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
 <PRE>

artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java

@@ -37,7 +37,7 @@ import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
 public class ActiveMQJMSClient
 {
    /**
-    * Creates a ActiveMQConnectionFactory;
+    * Creates an ActiveMQConnectionFactory;
     *
     * @return the ActiveMQConnectionFactory
     */
@@ -48,7 +48,7 @@ public class ActiveMQJMSClient
    }
 
    /**
-    * 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.
     * <p>
     * The discoveryAddress and discoveryPort parameters in this method are used to listen for UDP
@@ -94,7 +94,7 @@ public class ActiveMQJMSClient
    }
 
    /**
-    * 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 @@ public class ActiveMQJMSClient
    }
 
    /**
-    * 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.
     * <p>
     * The initial list of servers supplied in this method is simply to make an initial connection to
@@ -180,7 +180,7 @@ public class ActiveMQJMSClient
    }
 
    /**
-    * 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.
     * <p>
     * The ActiveMQConnectionFactory is not updated automatically as the cluster topology changes, and

artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java

@@ -54,7 +54,7 @@ public class JMSManagementHelper
    }
 
    /**
-    * 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 @@ public class JMSManagementHelper
    }
 
    /**
-    * 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

artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java

@@ -307,7 +307,7 @@ public class ActiveMQSession implements QueueSession, TopicSession
    {
       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 class ActiveMQSession implements QueueSession, TopicSession
 
       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 class ActiveMQSession implements QueueSession, TopicSession
       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 class ActiveMQSession implements QueueSession, TopicSession
       }
       if (!(queue instanceof ActiveMQDestination))
       {
-         throw new InvalidDestinationException("Not a ActiveMQQueue:" + queue);
+         throw new InvalidDestinationException("Not an ActiveMQQueue:" + queue);
       }
       if ("".equals(filterString))
       {

artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 /**
  *
- * 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.
  *

artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/ConnectionFactoryObjectFactory.java

@@ -27,7 +27,7 @@ import javax.naming.spi.ObjectFactory;
  *
  * A ConnectionFactoryObjectFactory.
  *
- * Given a reference - reconstructs a ActiveMQRAConnectionFactory
+ * Given a reference - reconstructs an ActiveMQRAConnectionFactory
  */
 public class ConnectionFactoryObjectFactory implements ObjectFactory
 {

artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/referenceable/DestinationObjectFactory.java

@@ -27,7 +27,7 @@ import javax.naming.spi.ObjectFactory;
  *
  * A DestinationObjectFactory.
  *
- * Given a Reference - reconstructs a ActiveMQDestination
+ * Given a Reference - reconstructs an ActiveMQDestination
  */
 public class DestinationObjectFactory implements ObjectFactory
 {

artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java

@@ -1840,7 +1840,7 @@ public final class JMSBridgeImpl implements JMSBridge
 
             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)

artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/embedded/EmbeddedJMS.java

@@ -30,7 +30,7 @@ import org.apache.activemq.artemis.spi.core.naming.BindingRegistry;
 
 /**
  * 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.
  * <p>
  * 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

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 class AMQConnectionContext
       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 class AMQConnectionContext
 
    public void setDontSendReponse(boolean b)
    {
-      this.dontSendReponse = b;
+      this.dontSendResponse = b;
    }
 
    public boolean isDontSendReponse()
    {
-      return dontSendReponse;
+      return dontSendResponse;
    }
 
    /**

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
     */

artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java

@@ -28,7 +28,7 @@ import org.proton.plug.util.CreditsSemaphore;
 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
 {

artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java

@@ -179,7 +179,7 @@ public class StompDecoder
     * 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.
     */

artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java

@@ -24,7 +24,7 @@ import javax.management.ObjectName;
 
 
 /**
- * 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

artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java

@@ -24,7 +24,7 @@ import org.jboss.resteasy.specimpl.ResteasyUriBuilder;
 import org.jboss.resteasy.spi.Link;
 
 /**
- * Forwarding to a ActiveMQ/REST-* endpoing
+ * Forwarding to an ActiveMQ/REST-* endpoing
  */
 public class ActiveMQPushStrategy extends UriTemplateStrategy
 {

artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java

@@ -156,7 +156,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
          {
             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 abstract class ComparisonExpression extends BinaryExpression implements B
    {
       checkEqualOperand(left);
       checkEqualOperand(right);
-      checkEqualOperandCompatability(left, right);
+      checkEqualOperandCompatibility(left, right);
       return doCreateEqual(left, right);
    }
 
@@ -393,7 +393,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
     * @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)
       {

artemis-selector/src/main/javacc/HyphenatedParser.jj

@@ -134,7 +134,7 @@ TOKEN [IGNORE_CASE] :
 }
 
 // ----------------------------------------------------------------------------
-// Grammer
+// Grammar
 // ----------------------------------------------------------------------------
 BooleanExpression JmsSelector() :
 {

artemis-selector/src/main/javacc/StrictParser.jj

@@ -134,7 +134,7 @@ TOKEN [IGNORE_CASE] :
 }
 
 // ----------------------------------------------------------------------------
-// Grammer
+// Grammar
 // ----------------------------------------------------------------------------
 BooleanExpression JmsSelector() :
 {

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.ActiveMQMessageBundle;
 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.
 *

artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java

@@ -138,7 +138,7 @@ public class MessageCounter
    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);

artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java

@@ -396,14 +396,14 @@ public class PageSubscriptionCounterImpl implements PageSubscriptionCounter
       {
          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 class PageSubscriptionCounterImpl implements PageSubscriptionCounter
       {
          for (ItemOper oper : operations)
          {
-            oper.counter.incrementProcessed(oper.id, oper.ammount);
+            oper.counter.incrementProcessed(oper.id, oper.amount);
          }
       }
    }

artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java

@@ -281,7 +281,7 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo
    // 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.

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServers.java

@@ -28,7 +28,7 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl
 /**
  * ActiveMQServers is a factory class for instantiating ActiveMQServer instances.
  * <p>
- * 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

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java

@@ -295,7 +295,7 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom
       }
    }
    /**
-    * 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

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumVote.java

@@ -32,7 +32,7 @@ public abstract class QuorumVote<V extends Vote, T>
    }
 
    /**
-    * 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

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;

artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java

@@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.server.Queue;
 import org.apache.activemq.artemis.core.server.impl.RefsOperation;
 
 /**
- * A ActiveMQ Artemis internal transaction
+ * An ActiveMQ Artemis internal transaction
  */
 public interface Transaction
 {

artemis-server/src/main/resources/schema/artemis-configuration.xsd

@@ -1223,7 +1223,7 @@
          <xsd:element name="forward-when-no-consumers" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
             <xsd:annotation>
                <xsd:documentation>
-                  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.
                </xsd:documentation>
             </xsd:annotation>

artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java

@@ -1093,7 +1093,7 @@ public abstract class ActiveMQTestBase extends Assert
 
    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);
    }

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;
 
    /**

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`.
 

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.
 

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**

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.
 

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

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).
 

examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java

@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactor
 
 /**
  *
- * 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

examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java

@@ -35,7 +35,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers;
 
 /**
  *
- * 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

examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java

@@ -77,7 +77,7 @@ public class ClientKickoffExample extends ActiveMQExample
          // 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<String, String>());
          MBeanServerConnection mbsc = connector.getMBeanServerConnection();

examples/jms/client-side-failoverlistener/readme.html

@@ -30,7 +30,7 @@ under the License.
      <p>This example demonstrates how you can listen on failover event on the client side.</p>
 
      <p>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.</p>
+        but after a while the first server will crash. This will trigger a fail-over event.</p>
          
      <h2>Example step-by-step</h2>
      <p><em>To run the example, simply type <code>mvn verify -Pexample</code> from this directory</em></p>

examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java

@@ -34,7 +34,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
  * 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
 {

examples/jms/clustered-durable-subscription/readme.html

@@ -172,7 +172,7 @@ under the License.
         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.
          </li>
         <pre class="prettyprint">
            <code>

examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java

@@ -133,7 +133,7 @@ public class ClusteredDurableSubscriptionExample extends ActiveMQExample
          // 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)

examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java

@@ -36,7 +36,7 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl
 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
 {

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.config.impl.JMSQueueConfigurationI
 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
 {

examples/jms/expiry/readme.html

@@ -27,11 +27,11 @@ under the License.
   <body onload="prettyPrint()">
      <h1>JMS Expiration Example</h1>
 
-     <p>This example shows you how to configure ActiveMQ Artemis so messages are expipired after a certain time..</p>
+     <p>This example shows you how to configure ActiveMQ Artemis so messages are expipired after a certain time.</p>
      <p>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).</p>
      <p>ActiveMQ Artemis can assign a <em>expiry address</em> 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.
      <p>
          The example will send 1 message with a short <em>time-to-live</em> 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.

examples/jms/message-counters/readme.html

@@ -43,7 +43,7 @@ under the License.
      Queues are sampled every 10 seconds by default. For this example we will reduce it to 2 seconds by setting <code>message-counter-sample-period</code> to <code>2000</code>.<br />
      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 <code>message-counter-max-day-history</code> parameter.</p>
-     <p>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
+     <p>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.</p>
          
      <h2>Example step-by-step</h2>

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

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java

@@ -157,7 +157,7 @@ public class JmsSessionRecoverTest extends TestCase {
     }
 
     /**
-     * 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 class JmsSessionRecoverTest extends TestCase {
     }
 
     /**
-     * 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

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java

@@ -58,17 +58,17 @@ public class ProducerFlowControlSendFailTest extends ProducerFlowControlTest {
     }
     
     @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 class ProducerFlowControlSendFailTest extends ProducerFlowControlTest {
         keepGoing.set(false);
     }
 
-    public void testPubisherRecoverAfterBlockWithSyncSend() throws Exception {
+    public void testPublisherRecoverAfterBlockWithSyncSend() throws Exception {
         ActiveMQConnectionFactory factory = (ActiveMQConnectionFactory)createConnectionFactory();
         factory.setExceptionListener(null);
         factory.setUseAsyncSend(false);

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 class ProducerFlowControlTest extends JmsTestSupport {
         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 class ProducerFlowControlTest extends JmsTestSupport {
 		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 class ProducerFlowControlTest extends JmsTestSupport {
         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 class ProducerFlowControlTest extends JmsTestSupport {
         msg.acknowledge();
     }
 
-    public void test2ndPubisherWithStandardConnectionThatIsBlocked() throws Exception {
+    public void test2ndPublisherWithStandardConnectionThatIsBlocked() throws Exception {
         ConnectionFactory factory = createConnectionFactory();
         connection = (ActiveMQConnection)factory.createConnection();
         connections.add(connection);

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/TimeStampTest.java

@@ -85,7 +85,7 @@ public class TimeStampTest extends TestCase {
                                                                                                             && 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();

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java

@@ -758,7 +758,7 @@ public class BrokerTest extends BrokerTestSupport {
 
     //
     // 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 class BrokerTest extends BrokerTestSupport {
     // 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));

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java

@@ -358,7 +358,7 @@ public class RecoveryBrokerTest extends BrokerRestartTestSupport {
         assertNoMessagesLeft(connection);
     }
 
-    public void testQueuePersistentCommitedMessagesNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommittedMessagesNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = new ActiveMQQueue("TEST");
 
@@ -406,7 +406,7 @@ public class RecoveryBrokerTest extends BrokerRestartTestSupport {
     }
     
 
-    public void testQueuePersistentCommitedAcksNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommittedAcksNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = new ActiveMQQueue("TEST");
 

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java

@@ -455,7 +455,7 @@ public class XARecoveryBrokerTest extends BrokerRestartTestSupport {
 
     }
 
-    public void testQueuePersistentCommitedMessagesNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommittedMessagesNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = createDestination();
 
@@ -502,7 +502,7 @@ public class XARecoveryBrokerTest extends BrokerRestartTestSupport {
         assertNoMessagesLeft(connection);
     }
 
-    public void testQueuePersistentCommited2PhaseMessagesNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommitted2PhaseMessagesNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = createDestination();
 
@@ -551,7 +551,7 @@ public class XARecoveryBrokerTest extends BrokerRestartTestSupport {
         assertNoMessagesLeft(connection);
     }
 
-    public void testQueuePersistentCommitedAcksNotLostOnRestart() throws Exception {
+    public void testQueuePersistentCommittedAcksNotLostOnRestart() throws Exception {
 
         ActiveMQDestination destination = createDestination();
 
@@ -691,8 +691,8 @@ public class XARecoveryBrokerTest extends BrokerRestartTestSupport {
         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 committed acks", 0, destinationView.getQueueSize());
-        assertEquals("enqueue count does not see commited acks", 4, destinationView.getDequeueCount());
+        assertEquals("enqueue count does not see committed acks", 4, destinationView.getDequeueCount());
 
     }
 

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java

@@ -278,13 +278,13 @@ public class BrokerViewSlowStoreStartupTest {
 
         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) {
         }
 

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java

@@ -299,7 +299,7 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
         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();

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java

@@ -192,7 +192,7 @@ public class JobSchedulerTest {
         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();
             }
         });

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicDLQTest.java

@@ -374,7 +374,7 @@ public class VirtualTopicDLQTest extends TestCase {
 
         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) {

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1853Test.java

@@ -311,7 +311,7 @@ public class AMQ1853Test {
         }
 
         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) {

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java

@@ -83,7 +83,7 @@ public class AMQ1917Test extends TestCase {
             tpe.shutdown();
         }
 
-        public void testLoadedSendRecieveWithCorrelationId() throws Exception {
+        public void testLoadedSendReceiveWithCorrelationId() throws Exception {
 
             ActiveMQConnectionFactory connectionFactory = new org.apache.activemq.ActiveMQConnectionFactory();
             connectionFactory.setBrokerURL(connectionUri);

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java

@@ -45,7 +45,7 @@ import org.apache.activemq.util.Wait;
 import org.apache.log4j.Logger;
 
 /**
- * A AMQ1936Test
+ * AMQ1936Test
  *
  */
 public class AMQ1936Test extends TestCase {

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java

@@ -340,7 +340,7 @@ public class AMQ2149Test {
         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 class AMQ2149Test {
         });
 
         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 class AMQ2149Test {
         });
 
         final Timer timer = new Timer();
-        schedualRestartTask(timer, null);
+        scheduleRestartTask(timer, null);
 
         try {
             verifyOrderedMessageReceipt(ActiveMQDestination.TOPIC_TYPE);
@@ -441,7 +441,7 @@ public class AMQ2149Test {
         });
 
         final Timer timer = new Timer();
-        schedualRestartTask(timer, null);
+        scheduleRestartTask(timer, null);
 
         try {
             verifyOrderedMessageReceipt(destinationType, 1, true);
@@ -470,7 +470,7 @@ public class AMQ2149Test {
         }
     }
 
-    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) {

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2356Test.java

@@ -37,7 +37,7 @@ import org.apache.activemq.command.ActiveMQQueue;
 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

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java

@@ -101,7 +101,7 @@ public class AMQ2832Test {
         // 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);
 

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3014Test.java

@@ -41,7 +41,7 @@ import org.junit.Test;
  * 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.

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3120Test.java

@@ -74,7 +74,7 @@ public class AMQ3120Test {
         // 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);
 

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3674Test.java

@@ -73,7 +73,7 @@ public class AMQ3674Test {
             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);

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4062Test.java

@@ -130,7 +130,7 @@ public class AMQ4062Test {
     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 class AMQ4062Test {
         //assertEquals(0, info.getPrefetchSize());
 
         consumer=new PrefetchConsumer(false, connectionUri);
-        consumer.recieve();
+        consumer.receive();
         consumer.a.countDown();
 
         info=null;
@@ -213,7 +213,7 @@ public class AMQ4062Test {
             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");

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4323Test.java

@@ -78,7 +78,7 @@ public class AMQ4323Test {
         // 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);
 

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4504Test.java

@@ -73,7 +73,7 @@ public class AMQ4504Test {
         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();

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java

@@ -158,7 +158,7 @@ public class MemoryUsageBlockResumeTest extends TestSupport implements Thread.Un
 
         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 class MemoryUsageBlockResumeTest extends TestSupport implements Thread.Un
         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();
         }
 

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageCleanupTest.java

@@ -113,7 +113,7 @@ public class MemoryUsageCleanupTest {
     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 class MemoryUsageCleanupTest {
             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 class MemoryUsageCleanupTest {
         }));
 
         int endPercentage = broker.getAdminView().getMemoryPercentUsage();
-        LOG.info("MemoryUseage at test end = " + endPercentage);
+        LOG.info("MemoryUsage at test end = " + endPercentage);
     }
 
     public void destroyQueue() {

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/OptimizeAcknowledgeWithExpiredMsgsTest.java

@@ -306,7 +306,7 @@ public class OptimizeAcknowledgeWithExpiredMsgsTest {
         }
 
         public synchronized void onException(JMSException ex) {
-            LOG.error("JMS Exception occured.  Shutting down client.");
+            LOG.error("JMS Exception occurred.  Shutting down client.");
         }
     }
 }

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java

@@ -117,7 +117,7 @@ public class TempStorageBlockedBrokerTest extends TestSupport {
         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 class TempStorageBlockedBrokerTest extends TestSupport {
         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 {

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TempStoreDataCleanupTest.java

@@ -160,7 +160,7 @@ public class TempStoreDataCleanupTest {
         );
 
         int endPercentage = broker.getAdminView().getMemoryPercentUsage();
-        LOG.info("MemoryUseage at test end = " + endPercentage);
+        LOG.info("MemoryUsage at test end = " + endPercentage);
 
         assertEquals(startPercentage, endPercentage);
     }

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/CheckDuplicateMessagesOnDuplexTest.java

@@ -177,7 +177,7 @@ public class CheckDuplicateMessagesOnDuplexTest {
         ManagementContext managementContext = new ManagementContext();
         managementContext.setCreateConnector(false);
         localBroker.setManagementContext(managementContext);
-        PersistenceAdapter persistenceAdapter = persistanceAdapterFactory("target/local");
+        PersistenceAdapter persistenceAdapter = persistenceAdapterFactory("target/local");
         localBroker.setPersistenceAdapter(persistenceAdapter);
         List<TransportConnector> transportConnectors = new ArrayList<TransportConnector>();
         DebugTransportFactory tf = new DebugTransportFactory();
@@ -197,7 +197,7 @@ public class CheckDuplicateMessagesOnDuplexTest {
         ManagementContext managementContext = new ManagementContext();
         managementContext.setCreateConnector(false);
         remoteBroker.setManagementContext(managementContext);
-        PersistenceAdapter persistenceAdapter = persistanceAdapterFactory("target/remote");
+        PersistenceAdapter persistenceAdapter = persistenceAdapterFactory("target/remote");
         remoteBroker.setPersistenceAdapter(persistenceAdapter);
         List<NetworkConnector> networkConnectors = new ArrayList<NetworkConnector>();
         DiscoveryNetworkConnector networkConnector = new DiscoveryNetworkConnector();
@@ -281,15 +281,15 @@ public class CheckDuplicateMessagesOnDuplexTest {
         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 @@ public class CheckDuplicateMessagesOnDuplexTest {
         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 class CheckDuplicateMessagesOnDuplexTest {
             super.oneway(command);
         }
     }
-}
+}

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/network/NetworkFailoverTest.java

@@ -116,7 +116,7 @@ public class NetworkFailoverTest extends TestCase {
             }
         });
 
-        // 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;